tvec[234]<int> -> ivec[234]

howcome I didn't think of that before? lol

diff --git a/src/ai/Spawner.cpp b/src/ai/Spawner.cpp
index 2340067f32948b9ae6b7761212ebf6f7b459c757..863678d88d7f73a80195143dbe4943a8f2245efc 100644 (file)
--- a/src/ai/Spawner.cpp
+++ b/src/ai/Spawner.cpp
@@ -59,13 +59,13 @@ void Spawner::CheckDespawn() noexcept {
 void Spawner::TrySpawn() {
        if (controllers.size() >= max_entities) return;
 
-       glm::tvec3<int> chunk(
+       glm::ivec3 chunk(
                (rand() % (chunk_range * 2 + 1)) - chunk_range,
                (rand() % (chunk_range * 2 + 1)) - chunk_range,
                (rand() % (chunk_range * 2 + 1)) - chunk_range
        );
 
-       glm::tvec3<int> pos(
+       glm::ivec3 pos(
                rand() % Chunk::width,
                rand() % Chunk::height,
                rand() % Chunk::depth
@@ -91,7 +91,7 @@ void Spawner::TrySpawn() {
        Spawn(world.Player().ChunkCoords() + chunk, glm::vec3(pos) + glm::vec3(0.5f));
 }
 
-void Spawner::Spawn(const glm::tvec3<int> &chunk, const glm::vec3 &pos) {
+void Spawner::Spawn(const glm::ivec3 &chunk, const glm::vec3 &pos) {
        glm::vec3 color(rand() % 6, rand() % 6, rand() % 6);
        color = color * 0.15f + 0.25f;
 

diff --git a/src/ai/Spawner.hpp b/src/ai/Spawner.hpp
index 120db6003424a1dfa91a0e0e387a502b5733554c..127a8606dbdfbb8a2a6e491d75b632a8fb22ba99 100644 (file)
--- a/src/ai/Spawner.hpp
+++ b/src/ai/Spawner.hpp
@@ -23,7 +23,7 @@ public:
 private:
        void CheckDespawn() noexcept;
        void TrySpawn();
-       void Spawn(const glm::tvec3<int> &, const glm::vec3 &);
+       void Spawn(const glm::ivec3 &, const glm::vec3 &);
 
 private:
        World &world;

diff --git a/src/graphics/Font.hpp b/src/graphics/Font.hpp
index 45ea9284b233bc7d7cb1e2a01666d5708f6b141d..b940059787ec0485ed153eb760f5e8b11078dacc 100644 (file)
--- a/src/graphics/Font.hpp
+++ b/src/graphics/Font.hpp
@@ -57,7 +57,7 @@ public:
 
        bool HasGlyph(Uint16) const noexcept;
 
-       glm::tvec2<int> TextSize(const char *) const;
+       glm::ivec2 TextSize(const char *) const;
 
        Texture Render(const char *) const;
        void Render(const char *, Texture &) const;

diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index 2b227422a48cb3b950390d73cf152350fcf7f716..be59d2357befaa1eae6481008e8852d8ae64617d 100644 (file)
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -101,8 +101,8 @@ bool Font::HasGlyph(Uint16 c) const noexcept {
 }
 
 
-glm::tvec2<int> Font::TextSize(const char *text) const {
-       glm::tvec2<int> size;
+glm::ivec2 Font::TextSize(const char *text) const {
+       glm::ivec2 size;
        if (TTF_SizeUTF8(handle, text, &size.x, &size.y) != 0) {
                throw std::runtime_error(TTF_GetError());
        }

diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp
index 82eade3be2b06771e49ffd159409520c12f42bbb..0d338bed9f3949a91c9854a254ac1c2fade51486 100644 (file)
--- a/src/ui/Interface.hpp
+++ b/src/ui/Interface.hpp
@@ -114,7 +114,7 @@ private:
        Sound place_sound;
        Sound remove_sound;
 
-       glm::tvec3<int> fwd, rev;
+       glm::ivec3 fwd, rev;
 
 };
 

diff --git a/src/world/Block.hpp b/src/world/Block.hpp
index 0bb5fd8964b0655dae6addb1dd49903cf89d08ff..274e3d3c3120369eb8915c752db357c8b8b80b23 100644 (file)
--- a/src/world/Block.hpp
+++ b/src/world/Block.hpp
@@ -66,7 +66,7 @@ struct Block {
                }
        }
 
-       static glm::tvec3<int> FaceNormal(Face face) noexcept {
+       static glm::ivec3 FaceNormal(Face face) noexcept {
                return face2normal[face];
        }
 
@@ -125,7 +125,7 @@ struct Block {
        };
 
 private:
-       static const glm::tvec3<int> face2normal[6];
+       static const glm::ivec3 face2normal[6];
        static const glm::mat4 orient2transform[ORIENT_COUNT];
        static const Face orient2face[ORIENT_COUNT][FACE_COUNT];
 

diff --git a/src/world/Chunk.hpp b/src/world/Chunk.hpp
index 7b84b6e9cd89a0aff3d4d9f1068bc8cb72b6c3f2..f4f0bf006300d0c68b40e88b6aed65210ce29e96 100644 (file)
--- a/src/world/Chunk.hpp
+++ b/src/world/Chunk.hpp
@@ -20,7 +20,7 @@ class WorldCollision;
 class Chunk {
 
 public:
-       using Pos = glm::tvec3<int>;
+       using Pos = glm::ivec3;
 
 public:
        explicit Chunk(const BlockTypeRegistry &) noexcept;

diff --git a/src/world/World.cpp b/src/world/World.cpp
index dc078189fdc494ab98bbb8dc93aeb4c12a565809..e8b665c992366ca2b5f2ecc0efd63447a2f8d73d 100644 (file)
--- a/src/world/World.cpp
+++ b/src/world/World.cpp
@@ -234,7 +234,7 @@ Chunk &World::PlayerChunk() {
        return chunks.ForceLoad(player->ChunkCoords());
 }
 
-Chunk &World::Next(const Chunk &to, const glm::tvec3<int> &dir) {
+Chunk &World::Next(const Chunk &to, const glm::ivec3 &dir) {
        const Chunk::Pos tgt_pos = to.Position() + dir;
        return chunks.ForceLoad(tgt_pos);
 }

diff --git a/src/world/World.hpp b/src/world/World.hpp
index da02b1f25902f42dc4ba8774900005a57e9f071c..b98efca544ef0969af3f056075b43f039986e80f 100644 (file)
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -55,7 +55,7 @@ public:
        Entity &AddEntity() { entities.emplace_back(); return entities.back(); }
 
        Chunk &PlayerChunk();
-       Chunk &Next(const Chunk &to, const glm::tvec3<int> &dir);
+       Chunk &Next(const Chunk &to, const glm::ivec3 &dir);
 
        void Update(int dt);
 

diff --git a/src/world/block.cpp b/src/world/block.cpp
index 442e54f4d591a64115f0d5ec3d0768dba660045b..e06f3e0bc63d84c29b86b7defcce8d0f3a34af27 100644 (file)
--- a/src/world/block.cpp
+++ b/src/world/block.cpp
@@ -155,7 +155,7 @@ const glm::mat4 Block::orient2transform[ORIENT_COUNT] = {
        {  0,  0,  1,  0,  1,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  1, }, // face: back,  turn: right
 };
 
-const glm::tvec3<int> Block::face2normal[FACE_COUNT] = {
+const glm::ivec3 Block::face2normal[FACE_COUNT] = {
        {  0,  1,  0 },
        {  0, -1,  0 },
        {  1,  0,  0 },

diff --git a/tst/graphics/GLTraitsTest.cpp b/tst/graphics/GLTraitsTest.cpp
index 956733153eb12308534bfc0b55a9bfdbd0ef4344..54d860c23aba549610337293bed8cff38e0ef65b 100644 (file)
--- a/tst/graphics/GLTraitsTest.cpp
+++ b/tst/graphics/GLTraitsTest.cpp
@@ -66,15 +66,15 @@ void GLTraitsTest::testSize() {
 
        CPPUNIT_ASSERT_EQUAL_MESSAGE(
                "bad number of components for vec2i",
-               2, gl_traits<glm::tvec2<int>>::size
+               2, gl_traits<glm::ivec2>::size
        );
        CPPUNIT_ASSERT_EQUAL_MESSAGE(
                "bad number of components for vec3i",
-               3, gl_traits<glm::tvec3<int>>::size
+               3, gl_traits<glm::ivec3>::size
        );
        CPPUNIT_ASSERT_EQUAL_MESSAGE(
                "bad number of components for vec4i",
-               4, gl_traits<glm::tvec4<int>>::size
+               4, gl_traits<glm::ivec4>::size
        );
 }
 

diff --git a/tst/world/BlockTest.cpp b/tst/world/BlockTest.cpp
index b10e9c990efc5ab9b1600097d99fcc83ae36c642..85b5a68b33a0ec04cd85c1429db1cfc2667fd347 100644 (file)
--- a/tst/world/BlockTest.cpp
+++ b/tst/world/BlockTest.cpp
@@ -74,27 +74,27 @@ void BlockTest::testFaceAxis() {
 void BlockTest::testFaceNormal() {
        CPPUNIT_ASSERT_EQUAL_MESSAGE(
                "[ 0, 1, 0 ] not normal of UP",
-               glm::tvec3<int>(0, 1, 0), Block::FaceNormal(Block::FACE_UP)
+               glm::ivec3(0, 1, 0), Block::FaceNormal(Block::FACE_UP)
        );
        CPPUNIT_ASSERT_EQUAL_MESSAGE(
                "[ 0, -1, 0 ] not normal of DOWN",
-               glm::tvec3<int>(0, -1, 0), Block::FaceNormal(Block::FACE_DOWN)
+               glm::ivec3(0, -1, 0), Block::FaceNormal(Block::FACE_DOWN)
        );
        CPPUNIT_ASSERT_EQUAL_MESSAGE(
                "[ 1, 0, 0 ] not normal of RIGHT",
-               glm::tvec3<int>(1, 0, 0), Block::FaceNormal(Block::FACE_RIGHT)
+               glm::ivec3(1, 0, 0), Block::FaceNormal(Block::FACE_RIGHT)
        );
        CPPUNIT_ASSERT_EQUAL_MESSAGE(
                "[ -1, 0, 0 ] not normal of LEFT",
-               glm::tvec3<int>(-1, 0, 0), Block::FaceNormal(Block::FACE_LEFT)
+               glm::ivec3(-1, 0, 0), Block::FaceNormal(Block::FACE_LEFT)
        );
        CPPUNIT_ASSERT_EQUAL_MESSAGE(
                "[ 0, 0, 1 ] not normal of FRONT",
-               glm::tvec3<int>(0, 0, 1), Block::FaceNormal(Block::FACE_FRONT)
+               glm::ivec3(0, 0, 1), Block::FaceNormal(Block::FACE_FRONT)
        );
        CPPUNIT_ASSERT_EQUAL_MESSAGE(
                "[ 0, 0, -1 ] not normal of BACK",
-               glm::tvec3<int>(0, 0, -1), Block::FaceNormal(Block::FACE_BACK)
+               glm::ivec3(0, 0, -1), Block::FaceNormal(Block::FACE_BACK)
        );
 }