diff --git a/res/textures/gui/crosshair.png b/res/textures/gui/crosshair.png new file mode 100644 index 00000000..7010266b Binary files /dev/null and b/res/textures/gui/crosshair.png differ diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp index c03ebf4b..2298904a 100644 --- a/src/assets/AssetsLoader.cpp +++ b/src/assets/AssetsLoader.cpp @@ -76,6 +76,7 @@ void AssetsLoader::addDefaults(AssetsLoader& loader, const Content* content) { loader.add(ASSET_SHADER, SHADERS_FOLDER"/skybox_gen", "skybox_gen"); loader.add(ASSET_TEXTURE, TEXTURES_FOLDER"/misc/moon.png", "misc/moon"); loader.add(ASSET_TEXTURE, TEXTURES_FOLDER"/misc/sun.png", "misc/sun"); + loader.add(ASSET_TEXTURE, TEXTURES_FOLDER"/gui/crosshair.png", "gui/crosshair"); addLayouts(0, "core", loader.getPaths()->getMainRoot()/fs::path("layouts"), loader); for (auto& pack : content->getPacks()) { diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index c0286eed..d54b1d99 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -49,9 +49,6 @@ #include "../items/Inventory.h" #include "../logic/scripting/scripting.h" -using glm::vec2; -using glm::vec3; -using glm::vec4; using namespace gui; static std::shared_ptr