From eb52a2124767152f0828c34764883e3d9a8b2ad8 Mon Sep 17 00:00:00 2001 From: voidProc Date: Sun, 12 Feb 2023 22:57:13 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=A2=E3=82=BB=E3=83=83=E3=83=88=E3=82=92?= =?UTF-8?q?=E3=83=AA=E3=82=BD=E3=83=BC=E3=82=B9=E3=81=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chocokurei/App/Resource.rc | 52 +++++++++++++++----- chocokurei/App/images/print_resource.ps1 | 1 + chocokurei/App/images/print_textureasset.ps1 | 1 + chocokurei/Main.cpp | 39 +++++++++++---- 4 files changed, 71 insertions(+), 22 deletions(-) create mode 100644 chocokurei/App/images/print_resource.ps1 create mode 100644 chocokurei/App/images/print_textureasset.ps1 diff --git a/chocokurei/App/Resource.rc b/chocokurei/App/Resource.rc index 48eca93..a6eb08a 100644 --- a/chocokurei/App/Resource.rc +++ b/chocokurei/App/Resource.rc @@ -85,33 +85,33 @@ 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) ////////////////////////////////////////////////////// // @@ -119,7 +119,33 @@ Resource(engine/soundfont/GMGSx.sf2.zstdcmp) // ////////////////////////////////////////////////////// +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 diff --git a/chocokurei/App/images/print_resource.ps1 b/chocokurei/App/images/print_resource.ps1 new file mode 100644 index 0000000..4d744ff --- /dev/null +++ b/chocokurei/App/images/print_resource.ps1 @@ -0,0 +1 @@ +ls *.png | %{ "Resource(images/$($_.Name))" } diff --git a/chocokurei/App/images/print_textureasset.ps1 b/chocokurei/App/images/print_textureasset.ps1 new file mode 100644 index 0000000..62286ee --- /dev/null +++ b/chocokurei/App/images/print_textureasset.ps1 @@ -0,0 +1 @@ +ls *.png | %{ "TextureAsset::Register(U`"$($_.BaseName)`", Resource(U`"images/$($_.Name)`"));" } diff --git a/chocokurei/Main.cpp b/chocokurei/Main.cpp index a95cc11..ddc8cf9 100644 --- a/chocokurei/Main.cpp +++ b/chocokurei/Main.cpp @@ -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() @@ -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();