shylie/glerminal
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Downloads LFS files
All checks were successful
Make PNG / build-app (push) Successful in 23s
Details

Browse Source
This commit is contained in:
Shylie 2024-05-29 08:03:31 -04:00
parent 7cd81b31eb
commit 844e1b6c7a
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/make_png.yaml
View File

@ -12,12 +12,14 @@ jobs:
with: with:
path: curr path: curr
submodules: recursive submodules: recursive
lfs: true
- name: Checkout previous - name: Checkout previous
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
path: prev path: prev
fetch-depth: 2 fetch-depth: 2
submodules: recursive submodules: recursive
lfs: true
- run: cd prev && git checkout HEAD^ - run: cd prev && git checkout HEAD^
- name: Build current - name: Build current
run: cmake -S curr -B curr/build -DGLERMINAL_TEST=ON && cmake --build curr/build run: cmake -S curr -B curr/build -DGLERMINAL_TEST=ON && cmake --build curr/build

6
source/glerminal.cpp
View File

@ -825,11 +825,7 @@ int glerminal_load_sprites_file(const char* filename)
stbi_uc* const buffer = stbi_load(filename, &w, &h, nullptr, 4); stbi_uc* const buffer = stbi_load(filename, &w, &h, nullptr, 4);
// verify atlas size is a multiple of CELL_SIZE in each dimension // verify atlas size is a multiple of CELL_SIZE in each dimension
if (!buffer) if (w % glerminal::CELL_SIZE == 0 && h % glerminal::CELL_SIZE == 0)
{
std::cout << stbi_failure_reason() << std::endl;
}
else if (w % glerminal::CELL_SIZE == 0 && h % glerminal::CELL_SIZE == 0)
{ {
GLERMINAL_G->load_atlas(w / glerminal::CELL_SIZE, h / glerminal::CELL_SIZE, reinterpret_cast<unsigned int*>(buffer)); GLERMINAL_G->load_atlas(w / glerminal::CELL_SIZE, h / glerminal::CELL_SIZE, reinterpret_cast<unsigned int*>(buffer));