diff --git a/src/graphics_menu.cpp b/src/graphics_menu.cpp index ce3d85b..e4fd46b 100644 --- a/src/graphics_menu.cpp +++ b/src/graphics_menu.cpp @@ -26,11 +26,11 @@ game::graphics_menu::graphics_menu(const std::function& on_close) : exposure_text("EXPOSURE: " + std::to_string(renderer::exposure), "../assets/fonts/bitmap/handwiriting-readable.png", glm::vec3(0.5f, 0.5f, 0.02f), glm::scale(glm::mat4(1.0f), glm::vec3(0.017f, 0.03f, 1.0f))), minimization_text("MINIMIZATION", "../assets/fonts/bitmap/handwiriting-readable.png", - glm::vec3(0.25f, 0.6f, 0.02f), glm::scale(glm::mat4(1.0f), glm::vec3(0.017f, 0.03f, 1.0f))), + glm::vec3(0.2f, 0.6f, 0.02f), glm::scale(glm::mat4(1.0f), glm::vec3(0.017f, 0.03f, 1.0f))), magnification_text("MAGNIFICATION", "../assets/fonts/bitmap/handwiriting-readable.png", - glm::vec3(0.25f, 0.45f, 0.02f), glm::scale(glm::mat4(1.0f), glm::vec3(0.017f, 0.03f, 1.0f))), + glm::vec3(0.2f, 0.45f, 0.02f), glm::scale(glm::mat4(1.0f), glm::vec3(0.017f, 0.03f, 1.0f))), anisotropy_text("ANISOTROPY : ", "../assets/fonts/bitmap/handwiriting-readable.png", - glm::vec3(0.25f, 0.3f, 0.02f), glm::scale(glm::mat4(1.0f), glm::vec3(0.017f, 0.03f, 1.0f))), + glm::vec3(0.2f, 0.3f, 0.02f), glm::scale(glm::mat4(1.0f), glm::vec3(0.017f, 0.03f, 1.0f))), fov(glm::vec3(0.5f, 0.85f, 0.02f), glm::vec2(0.12f, 0.02f)), framerate(glm::vec3(0.5f, 0.75f, 0.02f), glm::vec2(0.12f, 0.02f)), framerate_enable(glm::vec3(0.6f, 0.75f, 0.02f), glm::vec2(0.015f, 0.015f)), @@ -38,9 +38,9 @@ game::graphics_menu::graphics_menu(const std::function& on_close) : fullscreen(glm::vec3(0.6f, 0.65f, 0.02f), glm::vec2(0.015f, 0.015f)), gamma(glm::vec3(0.5f, 0.55f, 0.02f), glm::vec2(0.12f, 0.02f)), exposure(glm::vec3(0.5f, 0.45f, 0.02f), glm::vec2(0.12f, 0.02f)), - minimization(glm::vec3(0.25f, 0.55f, 0.016f), glm::vec2(0.12f, 0.02f)), - magnification(glm::vec3(0.25f, 0.4f, 0.018f), glm::vec2(0.12f, 0.02f)), - anisotropy(glm::vec3(0.25f, 0.25f, 0.02f), glm::vec2(0.12f, 0.02f)), + minimization(glm::vec3(0.2f, 0.55f, 0.016f), glm::vec2(0.12f, 0.02f)), + magnification(glm::vec3(0.2f, 0.4f, 0.018f), glm::vec2(0.12f, 0.02f)), + anisotropy(glm::vec3(0.2f, 0.25f, 0.02f), glm::vec2(0.12f, 0.02f)), back(glm::vec3(0.5f, 0.1f, 0.02f), glm::vec2(0.07f, 0.03f), "../assets/textures/White_Square.png", "BACK", "../assets/fonts/bitmap/handwiriting-readable.png") { // singleton stuff diff --git a/src/settings_menu.cpp b/src/settings_menu.cpp index 1527780..74c98c8 100644 --- a/src/settings_menu.cpp +++ b/src/settings_menu.cpp @@ -10,6 +10,8 @@ game::settings_menu* game::settings_menu::instance = nullptr; game::settings_menu::settings_menu(const std::function& on_close) : title("SETTINGS", "../assets/fonts/bitmap/handwiriting-readable.png", glm::vec3(0.5f, 0.95f, 0.02f), glm::scale(glm::mat4(1.0f), glm::vec3(0.03f, 0.05f, 1.0f))), + controls_info("CONTROLS:\nWASD - MOVEMENT\nSHIFT - DASH\nLMB - SHOOT\nRMB - SCOPE\nSCROOL - SWITCH WEAPONS\nE - HEAL\nF - SPECIAL POWER\nESCAPE - PAUSE GAME /\n UNPAUSE GAME /\n GO BACK (IN MENU)\nF1 - TOGGLE FULLSCREEN MODE", + "../assets/fonts/bitmap/handwiriting-readable.png", glm::vec3(0.0f, 1.0f, 0.04f), glm::scale(glm::mat4(1.0f), glm::vec3(0.015f, 0.025f, 1.0f)), glm::vec3(-1.0f, -1.0f, 0.0f)), volume_text("VOLUME", "../assets/fonts/bitmap/handwiriting-readable.png", glm::vec3(0.5f, 0.9f, 0.02f), glm::scale(glm::mat4(1.0f), glm::vec3(0.017f, 0.03f, 1.0f))), difficulty_text("DIFFICULTY : x" + std::to_string(game::gameplay_manager::difficulty_float), "../assets/fonts/bitmap/handwiriting-readable.png", diff --git a/src/settings_menu.h b/src/settings_menu.h index 3904b98..60280ea 100644 --- a/src/settings_menu.h +++ b/src/settings_menu.h @@ -10,6 +10,7 @@ namespace game { class settings_menu : public scripts_system::script { public: ui_system::ui_text title; + ui_system::ui_text controls_info; ui_system::ui_text volume_text; ui_system::ui_slider volume; ui_system::ui_text difficulty_text;