[Config] More options added to hide interface. [TitleScreenState] Bac…

…kground added.

client/source/core/Config.cpp

@@ -32,6 +32,9 @@ bool Config::isNoClipEnabled = false;
 
 // Interface
 bool Config::isBlockInfoWidgetEnabled = true;
+bool Config::isFpsCounterEnabled = true;
+bool Config::isHotbarVisible = true;
+bool Config::isCrosshairVisible = true;
 
 // Graphics
 u16 Config::renderDistance = 8;
@@ -66,6 +69,9 @@ void Config::loadConfigFromFile(const char *file) {
 			isNoClipEnabled = lua["isNoClipEnabled"].get_or(isNoClipEnabled);
 
 			isBlockInfoWidgetEnabled = lua["isBlockInfoWidgetEnabled"].get_or(isBlockInfoWidgetEnabled);
+			isFpsCounterEnabled = lua["isFpsCounterEnabled"].get_or(isFpsCounterEnabled);
+			isHotbarVisible = lua["isHotbarVisible"].get_or(isHotbarVisible);
+			isCrosshairVisible = lua["isCrosshairVisible"].get_or(isCrosshairVisible);
 
 			renderDistance = lua["renderDistance"].get_or(renderDistance);
 			isTorchSmoothLightingEnabled = lua["isTorchSmoothLightingEnabled"].get_or(isTorchSmoothLightingEnabled);

client/source/core/Config.hpp

@@ -36,6 +36,9 @@ namespace Config {
 
 	// Interface
 	extern bool isBlockInfoWidgetEnabled;
+	extern bool isFpsCounterEnabled;
+	extern bool isHotbarVisible;
+	extern bool isCrosshairVisible;
 
 	// Graphics
 	extern u16 renderDistance;

client/source/hud/HUD.cpp

@@ -65,15 +65,19 @@ void HUD::onEvent(const SDL_Event &event) {
 	if (event.type == SDL_KEYDOWN && event.key.keysym.sym == SDLK_F3)
 		m_isDebugOverlayVisible ^= 1;
 
-	m_hotbar.onEvent(event);
+	if (Config::isHotbarVisible)
+		m_hotbar.onEvent(event);
+
 	m_blockCursor.onEvent(event, m_hotbar);
 }
 
 void HUD::update() {
 	// FIXME: Shouldn't be called every tick
-	m_hotbar.update();
+	if (Config::isHotbarVisible)
+		m_hotbar.update();
 
-	m_fpsText.setText(std::to_string(gk::GameClock::getFpsAverage()) + " FPS");
+	if (Config::isFpsCounterEnabled)
+		m_fpsText.setText(std::to_string(gk::GameClock::getFpsAverage()) + " FPS");
 
 	m_blockCursor.update(m_hotbar);
 
@@ -106,12 +110,17 @@ void HUD::draw(gk::RenderTarget &target, gk::RenderStates states) const {
 	if (Config::isBlockInfoWidgetEnabled)
 		target.draw(m_blockInfoWidget, states);
 
-	target.draw(m_hotbar, states);
-	target.draw(m_fpsText, states);
+	if (Config::isHotbarVisible)
+		target.draw(m_hotbar, states);
+
+	if (Config::isFpsCounterEnabled)
+		target.draw(m_fpsText, states);
+
 	target.draw(m_chat, states);
 
 	states.transform = gk::Transform::Identity;
 
-	target.draw(m_crosshair, states);
+	if (Config::isCrosshairVisible)
+		target.draw(m_crosshair, states);
 }
 

client/source/states/ServerConnectState.cpp

@@ -30,7 +30,7 @@
 #include "ServerConnectState.hpp"
 #include "ServerLoadingState.hpp"
 
-ServerConnectState::ServerConnectState() {
+ServerConnectState::ServerConnectState(gk::ApplicationState *parent) : InterfaceState(parent) {
 	m_textInput.setContent("localhost:4242");
 	m_textInput.setCharacterLimit(15 + 1 + 6);
 	m_textInput.setSize(400, 54);
@@ -86,6 +86,9 @@ void ServerConnectState::update() {
 }
 
 void ServerConnectState::draw(gk::RenderTarget &target, gk::RenderStates states) const {
+	if (m_parent)
+		target.draw(*m_parent, states);
+
 	prepareDraw(target, states);
 
 	target.draw(m_textInput, states);

client/source/states/ServerConnectState.hpp

@@ -34,7 +34,7 @@
 
 class ServerConnectState : public InterfaceState {
 	public:
-		ServerConnectState();
+		ServerConnectState(gk::ApplicationState *parent = nullptr);
 
 		void onEvent(const SDL_Event &event) override;
 

client/source/states/SettingsMenuState.cpp

@@ -122,6 +122,9 @@ void SettingsMenuState::addInterfaceButtons() {
 	m_menuWidget.reset(1, 8);
 
 	addToggleButton("Show block info", Config::isBlockInfoWidgetEnabled, false);
+	addToggleButton("Show FPS counter", Config::isFpsCounterEnabled, false);
+	addToggleButton("Show hotbar", Config::isHotbarVisible, false);
+	addToggleButton("Show crosshair", Config::isCrosshairVisible, false);
 }
 
 void SettingsMenuState::addGraphicsButtons() {

client/source/states/TitleScreenState.cpp

@@ -37,7 +37,7 @@ TitleScreenState::TitleScreenState() {
 	m_menuWidget.setScale(Config::guiScale, Config::guiScale, 1);
 
 	m_menuWidget.addButton("Play", [this] (TextButton &) {
-		m_stateStack->push<ServerConnectState>();
+		m_stateStack->push<ServerConnectState>(this);
 	});
 
 	m_menuWidget.addButton("Options...", [this] (TextButton &) {
@@ -59,9 +59,11 @@ void TitleScreenState::update() {
 }
 
 void TitleScreenState::draw(gk::RenderTarget &target, gk::RenderStates states) const {
-	if (&m_stateStack->top() == this) {
-		prepareDraw(target, states);
+	prepareDraw(target, states);
+
+	target.draw(m_background, states);
 
+	if (&m_stateStack->top() == this) {
 		target.draw(m_menuWidget, states);
 	}
 }

client/source/states/TitleScreenState.hpp

@@ -42,6 +42,8 @@ class TitleScreenState : public InterfaceState {
 		void draw(gk::RenderTarget &target, gk::RenderStates states) const override;
 
 		MenuWidget m_menuWidget{1, 3};
+
+		gk::Image m_background{"texture-title_screen"};
 };
 
 #endif // TITLESCREENSTATE_HPP_

resources/config/textures.xml

@@ -5,6 +5,7 @@
 	<texture name="furnace"          path="resources/textures/furnace.png" />
 	<texture name="inventory"        path="resources/textures/inventory.png" />
 	<texture name="toasts"           path="resources/textures/toasts.png" />
+	<texture name="title_screen"     path="resources/textures/title_screen.png" />
 	<texture name="widgets"          path="resources/textures/widgets.png" />
 	<texture name="workbench"        path="resources/textures/workbench.png" />
 	<texture name="player"           path="resources/textures/player.png" />