make stderr visible in standalone test

[blank.git] / src / world / Block.hpp

diff --git a/src/world/Block.hpp b/src/world/Block.hpp
index 4b4ea210596bbd8d3c6adb0f63e5131cf6065708..2eac5ff6ca13b688ad1892ec879181e87ce26bef 100644 (file)
--- a/src/world/Block.hpp
+++ b/src/world/Block.hpp
@@ -1,8 +1,9 @@
 #ifndef BLANK_WORLD_BLOCK_HPP_
 #define BLANK_WORLD_BLOCK_HPP_
 
+#include "../graphics/glm.hpp"
+
 #include <iosfwd>
-#include <glm/glm.hpp>
 
 
 namespace blank {
@@ -11,7 +12,6 @@ namespace blank {
 struct Block {
 
        using Type = unsigned short;
-       using Pos = glm::vec3;
 
        enum Face {
                FACE_UP,
@@ -87,7 +87,7 @@ struct Block {
        }
 
        static Face NormalFace(const glm::vec3 &norm) noexcept {
-               const glm::vec3 anorm(abs(norm));
+               const glm::vec3 anorm(glm::abs(norm));
                if (anorm.x > anorm.y) {
                        if (anorm.x > anorm.z) {
                                return norm.x > 0.0f ? FACE_RIGHT : FACE_LEFT;