This commit is contained in:
parent
7cd81b31eb
commit
844e1b6c7a
@ -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
|
||||||
|
@ -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));
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user