From: Clyne Sullivan Date: Thu, 12 Sep 2019 18:24:18 +0000 (-0400) Subject: switch to pairs X-Git-Tag: v0.2-alpha~5^2~10 X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=889543e9862e5c6f4adb5c07112bdfd23fe55833;p=clyne%2Fgamedev2.git switch to pairs --- diff --git a/src/text.cpp b/src/text.cpp index 2258774..7b2eb02 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -2,10 +2,12 @@ #include +#include + struct FT_Info { - vec2 wh; - vec2 bl; - vec2 ad; + std::pair wh; + std::pair bl; + std::pair ad; GLuint tex; FT_Info(void) @@ -69,12 +71,9 @@ void TextSystem::loadFont(const std::string& name, for (auto j = buf.size(); j--;) buf[j] |= g->bitmap.buffer[j] << 24; - d.wh.x = g->bitmap.width; - d.wh.y = g->bitmap.rows; - d.bl.x = g->bitmap_left; - d.bl.y = g->bitmap_top; - d.ad.x = g->advance.x >> 6; - d.ad.y = g->advance.y >> 6; + d.wh = { g->bitmap.width, g->bitmap.rows }; + d.bl = { g->bitmap_left, g->bitmap_top }; + d.ad = { g->advance.x >> 6, g->advance.y >> 6 }; glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, g->bitmap.width, g->bitmap.rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, buf.data()); } diff --git a/src/text.hpp b/src/text.hpp index a0fd737..08248b3 100644 --- a/src/text.hpp +++ b/src/text.hpp @@ -30,7 +30,6 @@ #include struct FT_Info; -struct vec2 { float x; float y; }; /** * @class PhysicsSystem