Skip to content

Commit c1bffa9

Browse files
Refactor assets directory and add doomguy assets
1 parent d5e620c commit c1bffa9

File tree

10 files changed

+8
-7
lines changed

10 files changed

+8
-7
lines changed

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ if (RELWITHDEBINFO_FORCE_OPTIMIZATION_O3)
4747
string(REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
4848
endif()
4949

50+
#Directory all assets are contained in
51+
set(ASSETS "${PROJECT_SOURCE_DIR}/assets")
52+
5053
#Special: handle emscripten for running in web browser
5154
if ("${CMAKE_SYSTEM_NAME}" MATCHES "Emscripten")
5255
#Ensure Release builds have full optimization enabled
@@ -77,7 +80,7 @@ if ("${CMAKE_SYSTEM_NAME}" MATCHES "Emscripten")
7780
set(CMAKE_CXX17_COMPILE_FEATURES "cxx_std_17")
7881

7982
set(CMAKE_EXECUTABLE_SUFFIX ".html")
80-
set(ECXXFLAGS "-s USE_SDL=2 -s USE_SDL_TTF=2 -s EXIT_RUNTIME=1 --preload-file iosevka-regular.ttf --preload-file sky.bmp --preload-file floor.bmp")
83+
set(ECXXFLAGS "-s USE_SDL=2 -s USE_SDL_TTF=2 -s EXIT_RUNTIME=1 --preload-file ${ASSETS}@../assets")
8184
set_target_properties(main PROPERTIES LINK_FLAGS "${ECXXFLAGS} --emrun")
8285
set_target_properties(main PROPERTIES COMPILE_FLAGS "${ECXXFLAGS}")
8386
else ()
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

build-wasm/wall.bmp

-16.3 KB
Binary file not shown.

build/floor.bmp

-12.1 KB
Binary file not shown.

build/iosevka-regular.ttf

-380 KB
Binary file not shown.

build/sky.bmp

-96.1 KB
Binary file not shown.

main.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,6 @@ SDL_Surface* LoadTexture(char const* filename, SDL_PixelFormat const* const dstf
492492
return result;
493493
}
494494

495-
496495
int main(int argc, char* argv[])
497496
{
498497
// VERY IMPORTANT: Ensure SDL2 is initialized
@@ -551,17 +550,16 @@ int main(int argc, char* argv[])
551550

552551
// Just in case you need text:
553552
// load iosevka-regular.ttf at a large size into font
554-
res.font = TTF_OpenFont("iosevka-regular.ttf", 16);
553+
res.font = TTF_OpenFont("../assets/iosevka-regular.ttf", 16);
555554
if (res.font == nullptr)
556555
{
557556
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "TTF_OpenFont: %s\n", TTF_GetError());
558557
return 1;
559558
}
560-
561-
res.floor = LoadTexture("floor.bmp", res.display->format);
562-
res.skyTranspose = LoadTexture("sky.bmp", res.display->format);
563-
res.wallTranspose = LoadTexture("wall.bmp", res.display->format);
564559

560+
res.floor = LoadTexture("../assets/floor.bmp", res.display->format);
561+
res.skyTranspose = LoadTexture("../assets/sky.bmp", res.display->format);
562+
res.wallTranspose = LoadTexture("../assets/wall.bmp", res.display->format);
565563

566564
emscripten_set_main_loop_arg(GameLoop, &res, 0, 1);
567565

0 commit comments

Comments
 (0)