summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/editNetwork.cpp5
-rw-r--r--ui/editNetwork.h2
-rw-r--r--ui/font.cpp4
-rw-r--r--ui/font.h5
-rw-r--r--ui/gameMainSelector.cpp12
-rw-r--r--ui/gameMainSelector.h3
-rw-r--r--ui/text.cpp70
-rw-r--r--ui/text.h20
8 files changed, 59 insertions, 62 deletions
diff --git a/ui/editNetwork.cpp b/ui/editNetwork.cpp
index 7fbde32..ac2d93d 100644
--- a/ui/editNetwork.cpp
+++ b/ui/editNetwork.cpp
@@ -8,6 +8,7 @@
#include <gfx/gl/sceneShader.h>
#include <gfx/models/texture.h>
+const std::filesystem::path fontpath {"/usr/share/fonts/hack/Hack-Regular.ttf"};
constexpr const glm::u8vec4 TRANSPARENT_BLUE {30, 50, 255, 200};
EditNetwork::EditNetwork(Network * n) :
@@ -17,7 +18,7 @@ EditNetwork::EditNetwork(Network * n) :
{"ui/icon/network.png", mode.toggle<BuilderJoin>()},
{"ui/icon/network.png", mode.toggle<BuilderFreeExtend>()},
},
- blue {1, 1, &TRANSPARENT_BLUE}
+ blue {1, 1, &TRANSPARENT_BLUE}, font {fontpath, 15}
{
}
@@ -66,7 +67,7 @@ void
EditNetwork::render(const UIShader & shader, const UIComponent::Position & parentPos) const
{
if (builder) {
- Text {builder->hint(), {{50, 10}, {0, 15}}, {1, 1, 0}}.render(shader, parentPos);
+ Text {builder->hint(), font, {{50, 10}, {0, 15}}, {1, 1, 0}}.render(shader, parentPos);
}
builderToolbar.render(shader, parentPos);
}
diff --git a/ui/editNetwork.h b/ui/editNetwork.h
index 23dcf43..ec06fa7 100644
--- a/ui/editNetwork.h
+++ b/ui/editNetwork.h
@@ -7,7 +7,6 @@
#include <game/gamestate.h>
#include <game/network/network.h>
#include <gfx/models/texture.h>
-#include <optional>
template<typename> class Ray;
@@ -43,6 +42,7 @@ private:
Mode<Builder::Ptr, ModeSecondClick::NoAction> mode {builder};
Toolbar builderToolbar;
Texture blue;
+ const Font font;
};
template<typename T> class EditNetworkOf : public EditNetwork {
diff --git a/ui/font.cpp b/ui/font.cpp
index 305e0f3..b6669b0 100644
--- a/ui/font.cpp
+++ b/ui/font.cpp
@@ -1,6 +1,5 @@
#include "font.h"
#include <algorithm>
-#include <cache.h>
#include <cctype>
#include <ft2build.h>
#include FT_FREETYPE_H
@@ -60,8 +59,6 @@ using Face = glRef<FT_Face,
},
FT_Done_Face>;
-Cache<Font, std::filesystem::path, unsigned int> Font::cachedFontRenderings;
-
Font::Font(std::filesystem::path p, unsigned s) : path {std::move(p)}, size {getTextureSize(s)}
{
generateChars(BASIC_CHARS);
@@ -77,6 +74,7 @@ Font::generateChars(const utf8_string_view chars) const
if (charsData.find(codepoint) == charsData.end()) {
if (!ft) {
ft.emplace();
+ glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
}
if (!face) {
face.emplace(*ft, path.c_str());
diff --git a/ui/font.h b/ui/font.h
index 2f3337f..3254f80 100644
--- a/ui/font.h
+++ b/ui/font.h
@@ -1,22 +1,17 @@
#pragma once
#include <array>
-#include <cache.h>
#include <cstddef>
-#include <cstdint>
#include <filesystem>
#include <glArrays.h>
#include <glad/gl.h>
#include <glm/glm.hpp>
#include <map>
-#include <string_view>
#include <unicode.h>
#include <vector>
class Font {
public:
- static Cache<Font, std::filesystem::path, unsigned int> cachedFontRenderings;
-
Font(std::filesystem::path path, unsigned int height);
using Quad = std::array<glm::vec4, 4>;
diff --git a/ui/gameMainSelector.cpp b/ui/gameMainSelector.cpp
index a577838..5bef48d 100644
--- a/ui/gameMainSelector.cpp
+++ b/ui/gameMainSelector.cpp
@@ -8,14 +8,16 @@
#include <game/selectable.h>
#include <game/worldobject.h> // IWYU pragma: keep
#include <gfx/gl/camera.h>
-#include <math.h>
#include <optional>
-#include <span>
#include <stream_support.h>
#include <typeinfo>
-#include <vector>
-GameMainSelector::GameMainSelector(const Camera * c, ScreenAbsCoord size) : UIComponent {{{}, size}}, camera {c} { }
+const std::filesystem::path fontpath {"/usr/share/fonts/hack/Hack-Regular.ttf"};
+
+GameMainSelector::GameMainSelector(const Camera * c, ScreenAbsCoord size) :
+ UIComponent {{{}, size}}, camera {c}, font {fontpath, 15}
+{
+}
constexpr ScreenAbsCoord TargetPos {5, 45};
@@ -26,7 +28,7 @@ GameMainSelector::render(const UIShader & shader, const Position & parentPos) co
target->render(shader, parentPos + position + TargetPos);
}
if (!clicked.empty()) {
- Text {clicked, {{50, 10}, {0, 15}}, {1, 1, 0}}.render(shader, parentPos);
+ Text {clicked, font, {{50, 10}, {0, 15}}, {1, 1, 0}}.render(shader, parentPos);
}
}
diff --git a/ui/gameMainSelector.h b/ui/gameMainSelector.h
index cc30707..ccf0fa0 100644
--- a/ui/gameMainSelector.h
+++ b/ui/gameMainSelector.h
@@ -2,7 +2,7 @@
#include "SDL_events.h"
#include "config/types.h"
-#include "special_members.h"
+#include "font.h"
#include "uiComponent.h"
#include "worldOverlay.h"
#include <glm/glm.hpp>
@@ -40,5 +40,6 @@ public:
private:
const Camera * camera;
+ const Font font;
std::string clicked;
};
diff --git a/ui/text.cpp b/ui/text.cpp
index b776b90..5675061 100644
--- a/ui/text.cpp
+++ b/ui/text.cpp
@@ -1,44 +1,48 @@
#include "text.h"
#include "font.h"
#include "gfx/gl/uiShader.h"
+#include "gfx/gl/vertexArrayObject.h"
#include "uiComponent.h"
#include <array>
-#include <cache.h>
-#include <filesystem>
+#include <collections.h>
#include <glArrays.h>
#include <glm/gtc/type_ptr.hpp>
-#include <map>
-#include <memory>
+#include <maths.h>
+#include <numeric>
#include <utility>
-const std::filesystem::path font {"/usr/share/fonts/hack/Hack-Regular.ttf"};
-
-Text::Text(std::string_view s, Position pos, glm::vec3 c) : UIComponent {pos}, colour {c}
+Text::Text(std::string_view s, const Font & font, Position pos, glm::vec3 c) :
+ UIComponent {pos}, colour {c}, font {font}
{
- for (const auto & textureQuads :
- Font::cachedFontRenderings.get(font, static_cast<unsigned int>(pos.size.y))->render(s)) {
- auto & rendering
- = models.emplace_back(textureQuads.first, static_cast<GLsizei>(6 * textureQuads.second.size()));
- glBindVertexArray(rendering.vao);
-
- glBindBuffer(GL_ARRAY_BUFFER, rendering.vbo);
- std::vector<glm::vec4> vertices;
- vertices.reserve(6 * textureQuads.second.size());
- for (const auto & quad : textureQuads.second) {
- for (auto offset = 0U; offset < 3; offset += 2) {
- for (auto vertex = 0U; vertex < 3; vertex += 1) {
- vertices.emplace_back(quad[(vertex + offset) % 4] + glm::vec4 {position.origin, 0, 0});
- }
- }
- };
- glBufferData(GL_ARRAY_BUFFER, static_cast<GLsizeiptr>(sizeof(glm::vec4)) * rendering.count,
- glm::value_ptr(vertices.front()), GL_STATIC_DRAW);
-
- glEnableVertexAttribArray(0);
- glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(glm::vec4), nullptr);
+ VertexArrayObject {vao}.addAttribs<Font::Quad::value_type>(quads.bufferName(), 0);
+ operator=(s);
+}
- glBindVertexArray(0);
+Text &
+Text::operator=(const std::string_view s)
+{
+ auto tquads = font.render(s);
+ models.resize(tquads.size());
+ const auto glyphCount = std::accumulate(tquads.begin(), tquads.end(), size_t {}, [](auto && init, const auto & q) {
+ return init += q.second.size();
+ });
+ quads.resize(glyphCount);
+ GLint current = 0;
+ auto model = models.begin();
+ auto quad = quads.begin();
+ for (const auto & [texture, fquads] : tquads) {
+ model->first = texture;
+ model->second = {fquads.size() * 4, current * 4};
+ current += static_cast<GLint>(fquads.size());
+ model++;
+ quad = std::transform(fquads.begin(), fquads.end(), quad, [this](const Font::Quad & q) {
+ return q * [this](const glm::vec4 & corner) {
+ return corner + glm::vec4 {this->position.origin, 0, 0};
+ };
+ });
}
+ quads.unmap();
+ return *this;
}
void
@@ -46,10 +50,10 @@ Text::render(const UIShader & shader, const Position &) const
{
shader.text.use(colour);
glActiveTexture(GL_TEXTURE0);
+ glBindVertexArray(vao);
for (const auto & m : models) {
- glBindTexture(GL_TEXTURE_2D, m.texture);
- glBindVertexArray(m.vao);
- glDrawArrays(GL_TRIANGLES, 0, m.count);
+ glBindTexture(GL_TEXTURE_2D, m.first);
+ glDrawArrays(GL_QUADS, m.second.second, m.second.first);
}
glBindVertexArray(0);
glBindTexture(GL_TEXTURE_2D, 0);
@@ -60,5 +64,3 @@ Text::handleInput(const SDL_Event &, const Position &)
{
return false;
}
-
-Text::Model::Model(GLuint t, GLsizei c) : texture {t}, count {c} { }
diff --git a/ui/text.h b/ui/text.h
index de2fe2e..31ed9a5 100644
--- a/ui/text.h
+++ b/ui/text.h
@@ -1,31 +1,29 @@
#pragma once
+#include "font.h"
+#include "glContainer.h"
#include "uiComponent.h"
#include <glArrays.h>
#include <glad/gl.h>
#include <glm/glm.hpp>
#include <string_view>
-#include <vector>
class UIShader;
union SDL_Event;
class Text : public UIComponent {
public:
- Text(std::string_view s, Position, glm::vec3 colour);
+ Text(std::string_view s, const Font &, Position, glm::vec3 colour);
void render(const UIShader &, const Position & parentPos) const override;
bool handleInput(const SDL_Event &, const Position & parentPos) override;
-private:
- struct Model {
- Model(GLuint, GLsizei);
- GLuint texture;
- GLsizei count;
- glVertexArray vao;
- glBuffer vbo;
- };
+ Text & operator=(const std::string_view s);
- std::vector<Model> models;
+private:
+ std::vector<std::pair<GLuint, std::pair<GLsizei, GLint>>> models;
+ glContainer<Font::Quad> quads;
+ glVertexArray vao;
glm::vec3 colour;
+ const Font & font;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 14:43:09 +0000