new ui

Snake/src/Application.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <chrono>
-
 #include "Components.h"
 #include "Interface/ImGuiInterface.h"
 #include "Import/TextureLoader.h"
@@ -14,18 +13,21 @@
 #include "Systems/SystemManager.h"
 #include "Scene/SceneManager.h"
 #include "Graphics/Renderer/Texture2D.h"
-
+#include "UI/UiSystem.h"
+#include "UI/Widgets/UiBlock.h"
+#include "DebugUiBuilder.h"
 
 class Application {
 private:
 	ApplicationSettings settings;
 	SystemManager systemManager;
 	SceneManager sceneManager;
+	InputManager inputManager;
+	std::unique_ptr<UiSystem> ui_system;
 
 	std::unique_ptr<EventSystem> eventSystem;
 
 	Renderer* renderer;
-	std::shared_ptr<ImGuiInterface> minterface;
 
 	std::chrono::time_point<std::chrono::steady_clock> m_Start;
 
@@ -47,7 +49,12 @@ class Application {
 		renderer = Renderer::create(RendererType::DirectX);
 		window = renderer->createWindow(settings.getWindowWidth(), settings.getWindowHeight());
 
-		systemManager.initialize(&settings, &sceneManager, renderer);
+		ui_system.reset(new UiSystem(renderer, &inputManager, &settings));
+
+		DebugUiBuilder ui_builder;
+		ui_builder.build(ui_system.get());
+
+		systemManager.initialize(&settings, &sceneManager, renderer, ui_system.get());
 		sceneManager.loadSceneFromFile("test.scene");
 		initSystems();
 	}
@@ -60,12 +67,12 @@ class Application {
 
 			eventSystem->flush();
 			systemManager.update(dt);
-
+			ui_system->update();
 			//minterface->update(dt);
 
-			InputManager::instance()->mouseMoveX = 0.0;
-			InputManager::instance()->mouseMoveY = 0.0;
-			InputManager::instance()->mouseMoveCnt = 0;
+			inputManager.mouseMoveX = 0.0;
+			inputManager.mouseMoveY = 0.0;
+			inputManager.mouseMoveCnt = 0;
 			window->pollEvents();
 
             dt = std::chrono::duration<double, std::milli>(std::chrono::high_resolution_clock::now() - m_Start).count();

Snake/src/ApplicationSettings.h

@@ -3,12 +3,14 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #undef WIN32_LEAN_AND_MEAN
+#include <string>
+#include "Common/Helper.h"
 
 class ApplicationSettings 
 {
 private:
-	int windowHeight = 1080;
-	int windowWidth = 1920;
+	int windowHeight = 1440;
+	int windowWidth = 2560;
 
 	int shadowMapWidth = 1024;
 	int shadowMapHeight = 1024;
@@ -30,9 +32,9 @@ class ApplicationSettings
 		assetsDir = temp;
 	}
 
-	inline int getWindowWidth() { return windowWidth; }
-	inline int getWindowHeight() { return windowHeight; }
+	inline int getWindowWidth() const { return windowWidth; }
+	inline int getWindowHeight() const { return windowHeight; }
 
-	inline int getShadowMapWidth() { return shadowMapWidth; }
-	inline int getShadowMapHeight() { return shadowMapHeight; }
+	inline int getShadowMapWidth() const { return shadowMapWidth; }
+	inline int getShadowMapHeight() const { return shadowMapHeight; }
 };

Snake/src/DebugCameraController.h

@@ -31,15 +31,15 @@ class DebugCameraController {
 
     void updateRpgCamera(Camera* camera, double dt)
     {
-		if (InputManager::instance()->instance()->isKeyPressed(87)) {
+		if (InputManager::instance()->isKeyPressed(87)) {
 			camera->Position -= glm::vec3(1.0f, 0.0, 0.0) * 4.0f * (float)dt / 1000.0f;
-		} else if (InputManager::instance()->instance()->isKeyPressed(83)) {
+		} else if (InputManager::instance()->isKeyPressed(83)) {
 			camera->Position += glm::vec3(1.0f, 0.0, 0.0) * 4.0f * (float)dt / 1000.0f;
 		}
 
-		if (InputManager::instance()->instance()->isKeyPressed(65)) {
+		if (InputManager::instance()->isKeyPressed(65)) {
 			camera->Position += glm::vec3(0.0f, 0.0, 1.0) * 4.0f * (float)dt / 1000.0f;
-		} else if (InputManager::instance()->instance()->isKeyPressed(68)) {
+		} else if (InputManager::instance()->isKeyPressed(68)) {
 			camera->Position -= glm::vec3(0.0f, 0.0, 1.0) * 4.0f * (float)dt / 1000.0f;
 		}
     }
@@ -55,15 +55,15 @@ class DebugCameraController {
 		}
 
 
-		if (InputManager::instance()->instance()->isKeyPressed(87)) {
+		if (InputManager::instance()->isKeyPressed(87)) {
 			camera->Position -= camera->Front * 4.0f * (float)dt / 1000.0f;
-		} else if (InputManager::instance()->instance()->isKeyPressed(83)) {
+		} else if (InputManager::instance()->isKeyPressed(83)) {
 			camera->Position += camera->Front * 4.0f * (float)dt / 1000.0f;
 		}
 
-		if (InputManager::instance()->instance()->isKeyPressed(65)) {
+		if (InputManager::instance()->isKeyPressed(65)) {
 			camera->Position += camera->Right * 4.0f * (float)dt / 1000.0f;
-		} else if (InputManager::instance()->instance()->isKeyPressed(68)) {
+		} else if (InputManager::instance()->isKeyPressed(68)) {
 			camera->Position -= camera->Right * 4.0f * (float)dt / 1000.0f;
 		}
     }

Snake/src/DebugUiBuilder.h

@@ -0,0 +1,114 @@
+#pragma once
+
+#include "UI/UiSystem.h"
+#include "UI/Widgets/UiBlock.h"
+#include "Import/Texture/RawTexture.h"
+#include "UI/UiIcon.h"
+#include "UI/UiIconMenu.h"
+
+class DebugUiBuilder
+{
+public:
+	void build(UiSystem* ui_system)
+	{
+		UiBlock* block = new UiBlock();
+		{
+			block->color = glm::vec4(0.9019607, 0.9215686, 0.91764705, 1.0);
+			block->bg_color = glm::vec4(0.9019607, 0.9215686, 0.91764705, 1.0);
+
+			UiConstraints constraints;
+			constraints.setWidth({ ValueType::Relative, 100 });
+			constraints.setHeight({ ValueType::Absolute, 20 });
+			constraints.setXPos({ XPosition::Center });
+			constraints.setYPos({ YPosition::Bottom });
+
+			ui_system->add(ui_system->getRootElement(), block, constraints);
+		}
+
+		UiBlock* entity_list = new UiBlock();
+		entity_list->visible = false;
+
+		{
+			entity_list->color = glm::vec4(0.9019607, 0.9215686, 0.91764705, 1.0);
+			entity_list->bg_color = glm::vec4(0.9019607, 0.9215686, 0.91764705, 1.0);
+
+			UiConstraints constraints2;
+			constraints2.setWidth({ ValueType::Relative, 20 });
+			constraints2.setHeight({ ValueType::Relative, 20 });
+			constraints2.setXPos({ XPosition::Center });
+			constraints2.setYPos({ YPosition::Center });
+
+			ui_system->add(ui_system->getRootElement(), entity_list, constraints2);
+		}
+
+		buildUiList(ui_system);
+	}
+
+	void buildUiList(UiSystem* ui_system)
+	{
+		UiIconMenu* block1 = new UiIconMenu();
+		{
+			block1->bg_color = glm::vec4(0.9019607, 0.9215686, 0.91764705, 1.0);
+
+			UiConstraints constraints2;
+			constraints2.setWidth({ ValueType::Relative, 2 });
+			constraints2.setHeight({ ValueType::Relative, 60 });
+			constraints2.setXPos({ XPosition::Left });
+			constraints2.setYPos({ YPosition::Center });
+
+			ui_system->add(ui_system->getRootElement(), block1, constraints2);
+		}
+
+		{
+			RawTexture raw_icon_texture("icon/pencil.png");
+			raw_icon_texture.import();
+
+			Texture2D* icon_texture = Texture2D::create(
+				raw_icon_texture.getWidth(),
+				raw_icon_texture.getHeight(), 0,
+				raw_icon_texture.getData(),
+				TextureFormat::RGBA8,
+				TextureFlags::TF_ShaderResource | TextureFlags::TF_GenerateMips,
+				2
+			);
+			icon_texture->generateMips();
+
+			UiIcon* icon = new UiIcon(icon_texture);
+			{
+				icon->color = glm::vec4(0.9019607, 0.9215686, 0.91764705, 1.0);
+				icon->bg_color = glm::vec4(0.9019607, 0.9215686, 0.91764705, 1.0);
+
+				UiConstraints constraints;
+				constraints.setWidth({ ValueType::Absolute, 42 });
+				constraints.setHeight({ ValueType::Absolute, 42 });
+				constraints.setXPos({ XPosition::Center });
+				constraints.setYPos({ YPosition::Top });
+
+				ui_system->add(block1, icon, constraints);
+			}
+		}
+		{
+			RawTexture raw_icon_texture1("icon/entity.png");
+			raw_icon_texture1.import();
+
+			Texture2D* icon_texture1 = Texture2D::create(
+				raw_icon_texture1.getWidth(),
+				raw_icon_texture1.getHeight(), 0,
+				raw_icon_texture1.getData(),
+				TextureFormat::RGBA8,
+				TextureFlags::TF_ShaderResource | TextureFlags::TF_GenerateMips,
+				2
+			);
+			icon_texture1->generateMips();
+
+			UiConstraints constraints1;
+			constraints1.setWidth({ ValueType::Absolute, 42 });
+			constraints1.setHeight({ ValueType::Absolute, 42 });
+			constraints1.setXPos({ XPosition::Center });
+			constraints1.setYPos({ YPosition::Top });
+
+			UiIcon* icon1 = new UiIcon(icon_texture1);
+			ui_system->add(block1, icon1, constraints1);
+		}
+	}
+};

Snake/src/Graphics/DebugHelper.h

@@ -4,7 +4,6 @@
 #include "Renderer/IndexBuffer.h"
 #include "Renderer/VertexBuffer.h"
 #include "Renderer/ShaderPipeline.h"
-#include "Common/Helper.h"
 #include <memory>
 #include "Renderer.h"
 #include <vector>
@@ -75,7 +74,7 @@ class DebugHelper {
 		prevShader->bind(context);
 	}
 
-	void renderFont(const std::string& text, float x, float y)
+	void renderFont(const std::string& text, float x, float y, float scale)
 	{
 		Renderer* renderer = Renderer::instance();
 		RenderContext* context = renderer->getContext();
@@ -86,6 +85,6 @@ class DebugHelper {
 		x = x * 2.0f - 1.0f;
 		y = y * 2.0f - 1.0f;
 
-		fontRenderer.renderFont(text, x, y, 0.0015f);
+		fontRenderer.renderFont(text, x, y, scale);
 	}
 };