AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5 from lioncash/array 

Icon: Use std::array where applicable
This commit is contained in:
Phillip Stephens 2019-09-01 11:03:50 -07:00 committed by GitHub
parent 33a6e07e7a 532e6909f3
commit 0553faac37
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
specter/include/specter/Icon.hpp
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <array>
#include <cstddef> #include <cstddef>
#include "specter/View.hpp" #include "specter/View.hpp"
@ -15,9 +16,9 @@ class ViewResources;
struct Icon { struct Icon {
boo::ObjToken<boo::ITexture> m_tex; boo::ObjToken<boo::ITexture> m_tex;
zeus::CVector2f m_uvCoords[4]; std::array<zeus::CVector2f, 4> m_uvCoords;
Icon() = default; Icon() = default;
Icon(const boo::ObjToken<boo::ITexture>& tex, float rect[4]) : m_tex(tex) { Icon(boo::ObjToken<boo::ITexture> tex, const std::array<float, 4>& rect) : m_tex(std::move(tex)) {
m_uvCoords[0][0] = rect[0]; m_uvCoords[0][0] = rect[0];
m_uvCoords[0][1] = -rect[3]; m_uvCoords[0][1] = -rect[3];
@ -35,19 +36,23 @@ struct Icon {
template <size_t COLS, size_t ROWS> template <size_t COLS, size_t ROWS>
class IconAtlas { class IconAtlas {
boo::ObjToken<boo::ITextureS> m_tex; boo::ObjToken<boo::ITextureS> m_tex;
Icon m_icons[COLS][ROWS]; std::array<std::array<Icon, ROWS>, COLS> m_icons;
Icon MakeIcon(float x, float y) { Icon MakeIcon(float x, float y) const {
float rect[] = {x / float(COLS), y / float(ROWS), x / float(COLS) + 1.f / float(COLS), const std::array<float, 4> rect{
y / float(ROWS) + 1.f / float(ROWS)}; x / float(COLS),
y / float(ROWS),
x / float(COLS) + 1.f / float(COLS),
y / float(ROWS) + 1.f / float(ROWS),
};
return Icon(m_tex.get(), rect); return Icon(m_tex.get(), rect);
} }
public: public:
IconAtlas() = default; IconAtlas() = default;
operator bool() const { return m_tex.operator bool(); } operator bool() const { return m_tex.operator bool(); }
void initializeAtlas(const boo::ObjToken<boo::ITextureS>& tex) { void initializeAtlas(boo::ObjToken<boo::ITextureS> tex) {
m_tex = tex; m_tex = std::move(tex);
for (size_t c = 0; c < COLS; ++c) for (size_t c = 0; c < COLS; ++c)
for (size_t r = 0; r < ROWS; ++r) for (size_t r = 0; r < ROWS; ++r)
m_icons[c][r] = MakeIcon(c, r); m_icons[c][r] = MakeIcon(c, r);