summaryrefslogtreecommitdiffstats
path: root/game/client/world
diff options
context:
space:
mode:
Diffstat (limited to 'game/client/world')
-rw-r--r--game/client/world/chunk_mesher.hh4
-rw-r--r--game/client/world/chunk_quad.hh8
-rw-r--r--game/client/world/chunk_renderer.hh4
-rw-r--r--game/client/world/chunk_vbo.hh4
-rw-r--r--game/client/world/chunk_visibility.hh4
-rw-r--r--game/client/world/outline.hh4
-rw-r--r--game/client/world/player_target.hh4
-rw-r--r--game/client/world/skybox.hh4
-rw-r--r--game/client/world/voxel_anims.hh4
-rw-r--r--game/client/world/voxel_atlas.hh4
-rw-r--r--game/client/world/voxel_sounds.hh4
11 files changed, 2 insertions, 46 deletions
diff --git a/game/client/world/chunk_mesher.hh b/game/client/world/chunk_mesher.hh
index 14df019..cb0c7c5 100644
--- a/game/client/world/chunk_mesher.hh
+++ b/game/client/world/chunk_mesher.hh
@@ -1,5 +1,3 @@
-#ifndef CLIENT_CHUNK_MESHER_HH
-#define CLIENT_CHUNK_MESHER_HH 1
#pragma once
#include "client/world/chunk_vbo.hh"
@@ -18,5 +16,3 @@ void init(void);
void shutdown(void);
void update(void);
} // namespace world::chunk_mesher
-
-#endif // CLIENT_CHUNK_MESHER_HH
diff --git a/game/client/world/chunk_quad.hh b/game/client/world/chunk_quad.hh
index 9b3ca47..d160b7e 100644
--- a/game/client/world/chunk_quad.hh
+++ b/game/client/world/chunk_quad.hh
@@ -1,5 +1,3 @@
-#ifndef CLIENT_CHUNK_QUAD_HH
-#define CLIENT_CHUNK_QUAD_HH 1
#pragma once
#include "core/math/constexpr.hh"
@@ -15,8 +13,8 @@ using ChunkQuad = std::array<std::uint32_t, 2>;
namespace world
{
-constexpr inline static ChunkQuad make_chunk_quad(
- const glm::fvec3& position, const glm::fvec2& size, voxel_facing facing, std::size_t texture, std::size_t frames)
+constexpr inline static ChunkQuad make_chunk_quad(const glm::fvec3& position, const glm::fvec2& size, voxel_facing facing,
+ std::size_t texture, std::size_t frames)
{
ChunkQuad result = {};
result[0] = 0x00000000;
@@ -41,5 +39,3 @@ constexpr inline static ChunkQuad make_chunk_quad(
return result;
}
} // namespace world
-
-#endif // CLIENT_CHUNK_QUAD_HH
diff --git a/game/client/world/chunk_renderer.hh b/game/client/world/chunk_renderer.hh
index fdc5eea..2b73225 100644
--- a/game/client/world/chunk_renderer.hh
+++ b/game/client/world/chunk_renderer.hh
@@ -1,5 +1,3 @@
-#ifndef CLIENT_CHUNK_RENDERER_HH
-#define CLIENT_CHUNK_RENDERER_HH 1
#pragma once
namespace world::chunk_renderer
@@ -8,5 +6,3 @@ void init(void);
void shutdown(void);
void render(void);
} // namespace world::chunk_renderer
-
-#endif // CLIENT_CHUNK_RENDERER_HH
diff --git a/game/client/world/chunk_vbo.hh b/game/client/world/chunk_vbo.hh
index 586c313..175b34f 100644
--- a/game/client/world/chunk_vbo.hh
+++ b/game/client/world/chunk_vbo.hh
@@ -1,5 +1,3 @@
-#ifndef CLIENT_CHUNK_VBO_HH
-#define CLIENT_CHUNK_VBO_HH 1
#pragma once
namespace world
@@ -22,5 +20,3 @@ public:
}
};
} // namespace world
-
-#endif // CLIENT_CHUNK_VBO_HH
diff --git a/game/client/world/chunk_visibility.hh b/game/client/world/chunk_visibility.hh
index a57baa1..8d1f3cd 100644
--- a/game/client/world/chunk_visibility.hh
+++ b/game/client/world/chunk_visibility.hh
@@ -1,10 +1,6 @@
-#ifndef CLIENT_CHUNK_VISIBILITY_HH
-#define CLIENT_CHUNK_VISIBILITY_HH 1
#pragma once
namespace world::chunk_visibility
{
void update_late(void);
} // namespace world::chunk_visibility
-
-#endif // CLIENT_CHUNK_VISIBILITY_HH
diff --git a/game/client/world/outline.hh b/game/client/world/outline.hh
index 5cef7ed..2456a32 100644
--- a/game/client/world/outline.hh
+++ b/game/client/world/outline.hh
@@ -1,5 +1,3 @@
-#ifndef CLIENT_OUTLINE_HH
-#define CLIENT_OUTLINE_HH 1
#pragma once
#include "shared/types.hh"
@@ -16,5 +14,3 @@ namespace world::outline
void cube(const chunk_pos& cpos, const glm::fvec3& fpos, const glm::fvec3& size, float thickness, const glm::fvec4& color);
void line(const chunk_pos& cpos, const glm::fvec3& fpos, const glm::fvec3& size, float thickness, const glm::fvec4& color);
} // namespace world::outline
-
-#endif // CLIENT_OUTLINE_HH
diff --git a/game/client/world/player_target.hh b/game/client/world/player_target.hh
index 33d90fb..f137a1b 100644
--- a/game/client/world/player_target.hh
+++ b/game/client/world/player_target.hh
@@ -1,5 +1,3 @@
-#ifndef CLIENT_PLAYER_TARGET_HH
-#define CLIENT_PLAYER_TARGET_HH 1
#pragma once
#include "shared/world/voxel_registry.hh"
@@ -18,5 +16,3 @@ void init(void);
void update(void);
void render(void);
} // namespace world::player_target
-
-#endif // CLIENT_PLAYER_TARGET_HH
diff --git a/game/client/world/skybox.hh b/game/client/world/skybox.hh
index 6dd82f9..40113cd 100644
--- a/game/client/world/skybox.hh
+++ b/game/client/world/skybox.hh
@@ -1,5 +1,3 @@
-#ifndef CLIENT_SKYBOX_HH
-#define CLIENT_SKYBOX_HH 1
#pragma once
namespace world::skybox
@@ -11,5 +9,3 @@ namespace world::skybox
{
void init(void);
} // namespace world::skybox
-
-#endif // CLIENT_SKYBOX_HH
diff --git a/game/client/world/voxel_anims.hh b/game/client/world/voxel_anims.hh
index 5e9c56f..0d8a0d0 100644
--- a/game/client/world/voxel_anims.hh
+++ b/game/client/world/voxel_anims.hh
@@ -1,5 +1,3 @@
-#ifndef CLIENT_VOXEL_ANIMS_HH
-#define CLIENT_VOXEL_ANIMS_HH 1
#pragma once
namespace world::voxel_anims
@@ -13,5 +11,3 @@ namespace world::voxel_anims
void init(void);
void update(void);
} // namespace world::voxel_anims
-
-#endif // CLIENT_VOXEL_ANIMS_HH
diff --git a/game/client/world/voxel_atlas.hh b/game/client/world/voxel_atlas.hh
index f94c6bd..70e8a1e 100644
--- a/game/client/world/voxel_atlas.hh
+++ b/game/client/world/voxel_atlas.hh
@@ -1,5 +1,3 @@
-#ifndef CLIENT_VOXEL_ATLAS_HH
-#define CLIENT_VOXEL_ATLAS_HH 1
#pragma once
namespace world
@@ -28,5 +26,3 @@ namespace world::voxel_atlas
AtlasStrip* find_or_load(const std::vector<std::string>& paths);
AtlasStrip* find(const std::vector<std::string>& paths);
} // namespace world::voxel_atlas
-
-#endif // CLIENT_VOXEL_ATLAS_HH
diff --git a/game/client/world/voxel_sounds.hh b/game/client/world/voxel_sounds.hh
index d6f860f..b09b475 100644
--- a/game/client/world/voxel_sounds.hh
+++ b/game/client/world/voxel_sounds.hh
@@ -1,5 +1,3 @@
-#ifndef CLIENT_VOXEL_SOUNDS_HH
-#define CLIENT_VOXEL_SOUNDS_HH 1
#pragma once
#include "core/resource/resource.hh"
@@ -19,5 +17,3 @@ namespace world::voxel_sounds
resource_ptr<SoundEffect> get_footsteps(voxel_surface surface);
resource_ptr<SoundEffect> get_placebreak(voxel_surface surface);
} // namespace world::voxel_sounds
-
-#endif // CLIENT_VOXEL_SOUNDS_HH