diff --git a/CMakeLists.txt b/CMakeLists.txt index b238948..92fdc53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.25) -project(voxel-game VERSION 0.0.5) +project(voxel-game VERSION 0.0.6) option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF) option(ENABLE_UBSAN "Enable the ub sanitizer" OFF) diff --git a/default.nix b/default.nix index 933539a..8ce2a12 100644 --- a/default.nix +++ b/default.nix @@ -45,5 +45,5 @@ pkgs.mkShell libGL.dev glfw ]; - + LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib"; } diff --git a/lib/blt-with-graphics b/lib/blt-with-graphics index c8b9879..36159a3 160000 --- a/lib/blt-with-graphics +++ b/lib/blt-with-graphics @@ -1 +1 @@ -Subproject commit c8b9879e4976d162f81f69893b95587100fcdc02 +Subproject commit 36159a33b8e0909e0dc8b1eba5b13984d612a980 diff --git a/res/meow.png b/res/meow.png new file mode 100644 index 0000000..61b533a Binary files /dev/null and b/res/meow.png differ diff --git a/src/main.cpp b/src/main.cpp index 02277e4..afc45e8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,6 +33,7 @@ void init(const blt::gfx::window_data&) texture_array block_array{"blocks", voxel::IMAGE_SIZE, voxel::IMAGE_SIZE}; block_array.add_texture("ham.png", "ham"); + block_array.add_texture("meow.png", "meow"); resources.with(texture_info{"ham.png", "ham"}.set_desired_width(voxel::IMAGE_SIZE).set_desired_height(voxel::IMAGE_SIZE)); resources.with(std::move(block_array));