more textures
parent
c7385c6ea6
commit
87e92980e1
|
@ -1,5 +1,5 @@
|
||||||
cmake_minimum_required(VERSION 3.25)
|
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_ADDRSAN "Enable the address sanitizer" OFF)
|
||||||
option(ENABLE_UBSAN "Enable the ub sanitizer" OFF)
|
option(ENABLE_UBSAN "Enable the ub sanitizer" OFF)
|
||||||
|
|
|
@ -45,5 +45,5 @@ pkgs.mkShell
|
||||||
libGL.dev
|
libGL.dev
|
||||||
glfw
|
glfw
|
||||||
];
|
];
|
||||||
|
LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib";
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit c8b9879e4976d162f81f69893b95587100fcdc02
|
Subproject commit 36159a33b8e0909e0dc8b1eba5b13984d612a980
|
Binary file not shown.
After Width: | Height: | Size: 197 KiB |
|
@ -33,6 +33,7 @@ void init(const blt::gfx::window_data&)
|
||||||
|
|
||||||
texture_array block_array{"blocks", voxel::IMAGE_SIZE, voxel::IMAGE_SIZE};
|
texture_array block_array{"blocks", voxel::IMAGE_SIZE, voxel::IMAGE_SIZE};
|
||||||
block_array.add_texture("ham.png", "ham");
|
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(texture_info{"ham.png", "ham"}.set_desired_width(voxel::IMAGE_SIZE).set_desired_height(voxel::IMAGE_SIZE));
|
||||||
resources.with(std::move(block_array));
|
resources.with(std::move(block_array));
|
||||||
|
|
Loading…
Reference in New Issue