Skip to content

Commit

Permalink
アセットをリソースへ
Browse files Browse the repository at this point in the history
  • Loading branch information
@voidproc
voidproc committed Feb 12, 2023
1 parent 7754bd9 commit eb52a21
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 22 deletions.
52 changes: 39 additions & 13 deletions chocokurei/App/Resource.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,41 +85,67 @@ Resource(engine/texture/box-shadow/8.png)
//
// Fonts
//
Resource(engine/font/mplus/mplus-1p-thin.ttf.zstdcmp)
Resource(engine/font/mplus/mplus-1p-light.ttf.zstdcmp)
//Resource(engine/font/mplus/mplus-1p-thin.ttf.zstdcmp)
//Resource(engine/font/mplus/mplus-1p-light.ttf.zstdcmp)
Resource(engine/font/mplus/mplus-1p-regular.ttf.zstdcmp)
Resource(engine/font/mplus/mplus-1p-medium.ttf.zstdcmp)
Resource(engine/font/mplus/mplus-1p-bold.ttf.zstdcmp)
Resource(engine/font/mplus/mplus-1p-heavy.ttf.zstdcmp)
Resource(engine/font/mplus/mplus-1p-black.ttf.zstdcmp)
Resource(engine/font/noto-cjk/NotoSansCJK-Regular.ttc.zstdcmp)
//Resource(engine/font/mplus/mplus-1p-medium.ttf.zstdcmp)
//Resource(engine/font/mplus/mplus-1p-bold.ttf.zstdcmp)
//Resource(engine/font/mplus/mplus-1p-heavy.ttf.zstdcmp)
//Resource(engine/font/mplus/mplus-1p-black.ttf.zstdcmp)
//Resource(engine/font/noto-cjk/NotoSansCJK-Regular.ttc.zstdcmp)
//Resource(engine/font/noto-cjk/NotoSansJP-Regular.otf.zstdcmp)

//
// Emoji Fonts
//
Resource(engine/font/noto-emoji/NotoColorEmoji.ttf.zstdcmp)
Resource(engine/font/noto-emoji/NotoEmoji-Regular.ttf.zstdcmp)
//Resource(engine/font/noto-emoji/NotoColorEmoji.ttf.zstdcmp)
//Resource(engine/font/noto-emoji/NotoEmoji-Regular.ttf.zstdcmp)

//
// Icons
//
Resource(engine/font/fontawesome/fontawesome-brands.otf.zstdcmp)
Resource(engine/font/fontawesome/fontawesome-solid.otf.zstdcmp)
Resource(engine/font/materialdesignicons/materialdesignicons-webfont.ttf.zstdcmp)
//Resource(engine/font/fontawesome/fontawesome-brands.otf.zstdcmp)
//Resource(engine/font/fontawesome/fontawesome-solid.otf.zstdcmp)
//Resource(engine/font/materialdesignicons/materialdesignicons-webfont.ttf.zstdcmp)

//
// Sound Font
//
Resource(engine/soundfont/GMGSx.sf2.zstdcmp)
//Resource(engine/soundfont/GMGSx.sf2.zstdcmp)

//////////////////////////////////////////////////////
//
// Siv3D App Resources (Your application resources here)
//
//////////////////////////////////////////////////////

Resource(images/balloon.png)
Resource(images/bg.png)
Resource(images/box-3x3.png)
Resource(images/box-3x4.png)
Resource(images/box-4x4.png)
Resource(images/box-4x5.png)
Resource(images/box-4x6.png)
Resource(images/choco0.png)
Resource(images/choco1.png)
Resource(images/choco10.png)
Resource(images/choco11.png)
Resource(images/choco2.png)
Resource(images/choco3.png)
Resource(images/choco4.png)
Resource(images/choco5.png)
Resource(images/choco6.png)
Resource(images/choco7.png)
Resource(images/choco8.png)
Resource(images/choco9.png)
Resource(images/good.png)
Resource(images/miss.png)
Resource(images/next.png)
Resource(images/pronama-chan-fail.png)
Resource(images/pronama-chan.png)
Resource(images/titlebg.png)

Resource(fonts/k8x12L.ttf)

/* examples

Expand Down
1 change: 1 addition & 0 deletions chocokurei/App/images/print_resource.ps1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ls *.png | %{ "Resource(images/$($_.Name))" }
1 change: 1 addition & 0 deletions chocokurei/App/images/print_textureasset.ps1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ls *.png | %{ "TextureAsset::Register(U`"$($_.BaseName)`", Resource(U`"images/$($_.Name)`"));" }
39 changes: 30 additions & 9 deletions chocokurei/Main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,34 @@

void loadImages()
{
for (const auto& file : FileSystem::DirectoryContents(U"images", Recursive::No))
{
if (FileSystem::Extension(file) == U"png")
{
TextureAsset::Register(FileSystem::BaseName(file), file);
}
}
TextureAsset::Register(U"balloon", Resource(U"images/balloon.png"));
TextureAsset::Register(U"bg", Resource(U"images/bg.png"));
TextureAsset::Register(U"box-3x3", Resource(U"images/box-3x3.png"));
TextureAsset::Register(U"box-3x4", Resource(U"images/box-3x4.png"));
TextureAsset::Register(U"box-4x4", Resource(U"images/box-4x4.png"));
TextureAsset::Register(U"box-4x5", Resource(U"images/box-4x5.png"));
TextureAsset::Register(U"box-4x6", Resource(U"images/box-4x6.png"));
TextureAsset::Register(U"choco0", Resource(U"images/choco0.png"));
TextureAsset::Register(U"choco1", Resource(U"images/choco1.png"));
TextureAsset::Register(U"choco10", Resource(U"images/choco10.png"));
TextureAsset::Register(U"choco11", Resource(U"images/choco11.png"));
TextureAsset::Register(U"choco2", Resource(U"images/choco2.png"));
TextureAsset::Register(U"choco3", Resource(U"images/choco3.png"));
TextureAsset::Register(U"choco4", Resource(U"images/choco4.png"));
TextureAsset::Register(U"choco5", Resource(U"images/choco5.png"));
TextureAsset::Register(U"choco6", Resource(U"images/choco6.png"));
TextureAsset::Register(U"choco7", Resource(U"images/choco7.png"));
TextureAsset::Register(U"choco8", Resource(U"images/choco8.png"));
TextureAsset::Register(U"choco9", Resource(U"images/choco9.png"));
TextureAsset::Register(U"good", Resource(U"images/good.png"));
TextureAsset::Register(U"miss", Resource(U"images/miss.png"));
TextureAsset::Register(U"next", Resource(U"images/next.png"));
TextureAsset::Register(U"pronama-chan-fail", Resource(U"images/pronama-chan-fail.png"));
TextureAsset::Register(U"pronama-chan", Resource(U"images/pronama-chan.png"));
TextureAsset::Register(U"titlebg", Resource(U"images/titlebg.png"));
TextureAsset::Register(U"_choco", Resource(U"images/_choco.png"));
TextureAsset::Register(U"_judge", Resource(U"images/_judge.png"));
TextureAsset::Register(U"_layout", Resource(U"images/_layout.png"));
}

void Main()
Expand All @@ -33,8 +54,8 @@ void Main()

// アセット

FontAsset::Register(U"main", 12, U"fonts/k8x12L.ttf", FontStyle::Bitmap);
FontAsset::Register(U"mainb", 12, U"fonts/k8x12L.ttf", FontStyle::BoldBitmap);
FontAsset::Register(U"main", 12, Resource(U"fonts/k8x12L.ttf"), FontStyle::Bitmap);
FontAsset::Register(U"mainb", 12, Resource(U"fonts/k8x12L.ttf"), FontStyle::BoldBitmap);

loadImages();

Expand Down

0 comments on commit eb52a21

Please sign in to comment.