[WorldSelectionState] Background and title added (see #128)

Author: Unarelith

Diff for: resources/config/textures.xml

@@ -1,8 +1,10 @@
 <textures>
 	<texture name="block_destroy"    path="resources/textures/block_destroy.png" />
 	<texture name="font"             path="resources/textures/font.png" />
-	<texture name="toasts"           path="resources/textures/toasts.png" />
+	<texture name="menu_background"  path="resources/textures/menu_background.png" repeat="true" />
+	<texture name="player"           path="resources/textures/player.png" />
 	<texture name="title_screen"     path="resources/textures/title_screen.png" />
+	<texture name="toasts"           path="resources/textures/toasts.png" />
 	<texture name="widgets"          path="resources/textures/widgets.png" />
-	<texture name="player"           path="resources/textures/player.png" />
+	<texture name="world_icon"       path="resources/textures/world_icon.png" />
 </textures>

Diff for: resources/textures/menu_background.png

@@ -40,6 +40,19 @@ namespace fs = ghc::filesystem;
 WorldSelectionState::WorldSelectionState(TitleScreenState *titleScreen)
 	: InterfaceState(titleScreen), m_titleScreen(titleScreen)
 {
+	m_title.setScale(Config::guiScale, Config::guiScale);
+	m_title.setString("Select or create a world");
+	m_title.updateVertexBuffer();
+
+	m_background.setScale(Config::guiScale * 2, Config::guiScale * 2);
+	m_background.setPosRect(0, 0, Config::screenWidth / m_background.getScale().x, Config::screenHeight / m_background.getScale().y);
+	m_background.setClipRect(0, 0, Config::screenWidth / m_background.getScale().x, Config::screenHeight / m_background.getScale().y);
+
+	m_filter1.setSize(Config::screenWidth, Config::screenHeight);
+	m_filter1.setFillColor(gk::Color(0, 0, 0, 128));
+
+	m_filter2.setFillColor(gk::Color(0, 0, 0, 192));
+
 	m_menuWidget.setScale(Config::guiScale, Config::guiScale);
 	m_menuWidget.addButton("New world", [this](TextButton &) {
 		m_stateStack->push<WorldCreationState>(m_titleScreen);
@@ -74,7 +87,19 @@ void WorldSelectionState::update() {
 }
 
 void WorldSelectionState::updateWidgetPosition() {
-	m_cancelButton.setPosition(Config::screenWidth / 2.0f - m_cancelButton.getGlobalBounds().sizeX / 2.0f, Config::screenHeight * 0.85);
+	const int borderSize = 25 * Config::guiScale;
+	m_filter2.setSize(Config::screenWidth, Config::screenHeight - borderSize * 2);
+	m_filter2.setPosition(0, borderSize);
+
+	m_cancelButton.setPosition(
+		Config::screenWidth / 2.0f - m_cancelButton.getGlobalBounds().sizeX / 2.0f,
+		Config::screenHeight - borderSize / 2 - m_cancelButton.getGlobalBounds().sizeY / 2.0f
+	);
+
+	m_title.setPosition(
+		Config::screenWidth / 2.0f - m_title.getSize().x * Config::guiScale / 2.0f,
+		borderSize / 2 - m_title.getSize().y * Config::guiScale / 2.0f
+	);
 }
 
 void WorldSelectionState::loadSaveList() {
@@ -105,12 +130,15 @@ void WorldSelectionState::loadSaveList() {
 }
 
 void WorldSelectionState::draw(gk::RenderTarget &target, gk::RenderStates states) const {
-	if (m_parent)
-		target.draw(*m_parent, states);
-
 	if (&m_stateStack->top() == this) {
 		prepareDraw(target, states);
 
+		target.draw(m_background, states);
+		target.draw(m_filter1, states);
+		target.draw(m_filter2, states);
+
+		target.draw(m_title, states);
+
 		target.draw(m_menuWidget, states);
 		target.draw(m_cancelButton, states);
 	}

Diff for: resources/textures/world_icon.png

@@ -48,7 +48,13 @@ class WorldSelectionState : public InterfaceState {
 
 		TitleScreenState *m_titleScreen = nullptr;
 
-		MenuWidget m_menuWidget{1, 8};
+		gk::Image m_background{"texture-menu_background"};
+		gk::RectangleShape m_filter1;
+		gk::RectangleShape m_filter2;
+
+		Text m_title;
+
+		MenuWidget m_menuWidget{1, 11};
 
 		TextButton m_cancelButton;
 };

Diff for: source/client/states/WorldSelectionState.cpp

@@ -43,11 +43,12 @@ void TextureLoader::load(const char *xmlFilename, gk::ResourceHandler &handler)
 		auto &texture = handler.add<sf::Texture>("texture-" + name);
 		texture.loadFromFile(path);
 
-		// sf::Texture::bind(&texture);
-		// glGenerateMipmap(GL_TEXTURE_2D);
-		// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR);
-		// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 4);
-		// sf::Texture::bind(nullptr);
+		if (textureElement->Attribute("repeat", "true")) {
+			sf::Texture::bind(&texture);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+			sf::Texture::bind(nullptr);
+		}
 
 		textureElement = textureElement->NextSiblingElement("texture");
 	}