mirror/glerminal
1
0
Fork 0
mirror of https://git.shylie.info/shylie/glerminal.git synced 2024-12-22 22:50:06 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: mirror:844e1b6c7accf890052ccf9e907b7e4a2cbd60dc
Branches Tags
mirror:main
..
compare: mirror:ffcafb516076f527c2f67512d06d1fa441c239bd
Branches Tags
mirror:main

No commits in common. "844e1b6c7accf890052ccf9e907b7e4a2cbd60dc" and "ffcafb516076f527c2f67512d06d1fa441c239bd" have entirely different histories.
844e1b6c7a ... ffcafb5160

2 changed files with 1 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
.gitea/workflows/make_png.yaml
View File

@ -12,14 +12,12 @@ 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

2
source/glerminal.cpp
View File

@ -825,7 +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 (w % glerminal::CELL_SIZE == 0 && h % glerminal::CELL_SIZE == 0) if (buffer && 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));