From e806d41c8703ddc4bcaf2186d0c1701bd1e1ada3 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Wed, 22 Dec 2021 12:16:38 +0000 Subject: Initial commit with some basic UI --- ui/gameMainWindow.cpp | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'ui/gameMainWindow.cpp') diff --git a/ui/gameMainWindow.cpp b/ui/gameMainWindow.cpp index cd9d3e4..e1d9763 100644 --- a/ui/gameMainWindow.cpp +++ b/ui/gameMainWindow.cpp @@ -1,21 +1,36 @@ #include "gameMainWindow.h" -#include "collection.hpp" #include "gfx/camera_controller.h" #include "manualCameraController.h" -#include "ui/window.h" +#include "maths.h" +#include "toolbar.h" +#include "window.h" #include #include +#include #include #include // IWYU pragma: keep #include #include -#include #include +class GameMainToolbar : public Toolbar { +public: + GameMainToolbar() : + Toolbar { + {"ui/icon/network.png", + [](const SDL_Event &) { + // fprintf(stderr, "network click\n"); + }}, + } + { + } +}; + GameMainWindow::GameMainWindow(size_t w, size_t h) : Window {w, h, "I Like Trains"}, camera {{-1250.0F, -1250.0F, 35.0F}, 70.0F, rdiv(w, h), 0.1F, 10000.0F} { - inputStack.create(glm::vec2 {-1150, -1150}); + uiComponents.create(); + uiComponents.create(glm::vec2 {-1150, -1150}); shader.setUniform("lightDirection", glm::normalize(glm::vec3 {1, 0, -1})); shader.setUniform("lightColor", {.6, .6, .6}); @@ -25,7 +40,7 @@ GameMainWindow::GameMainWindow(size_t w, size_t h) : void GameMainWindow::tick(TickDuration) { - inputStack.apply(&CameraController::updateCamera, &camera); + uiComponents.apply(&CameraController::updateCamera, &camera); shader.setView(camera.GetViewProjection()); } -- cgit v1.2.3