X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FBlock.hpp;h=274e3d3c3120369eb8915c752db357c8b8b80b23;hb=071459d05271dd9376364fc3d8c33bf091724321;hp=9fd545b3813ce5c24e244e42bbb593b75606e690;hpb=d71d636af8b6f493abe537088464d1dc6b816c04;p=blank.git diff --git a/src/world/Block.hpp b/src/world/Block.hpp index 9fd545b..274e3d3 100644 --- a/src/world/Block.hpp +++ b/src/world/Block.hpp @@ -1,6 +1,7 @@ #ifndef BLANK_WORLD_BLOCK_HPP_ #define BLANK_WORLD_BLOCK_HPP_ +#include #include @@ -65,7 +66,7 @@ struct Block { } } - static glm::tvec3 FaceNormal(Face face) noexcept { + static glm::ivec3 FaceNormal(Face face) noexcept { return face2normal[face]; } @@ -124,12 +125,18 @@ struct Block { }; private: - static const glm::tvec3 face2normal[6]; + static const glm::ivec3 face2normal[6]; static const glm::mat4 orient2transform[ORIENT_COUNT]; static const Face orient2face[ORIENT_COUNT][FACE_COUNT]; }; +bool operator ==(const Block &, const Block &); + +std::ostream &operator <<(std::ostream &, const Block &); +std::ostream &operator <<(std::ostream &, const Block::Face &); +std::ostream &operator <<(std::ostream &, const Block::Turn &); + } #endif