From 8bcbd2729388edc63c82d77d314b583af1447c49 Mon Sep 17 00:00:00 2001 From: untodesu Date: Sun, 14 Sep 2025 19:16:44 +0500 Subject: Cleanup math with qfengine ports again --- game/client/world/chunk_mesher.cc | 6 +++--- game/client/world/voxel_atlas.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'game/client/world') diff --git a/game/client/world/chunk_mesher.cc b/game/client/world/chunk_mesher.cc index bc90a03..da90d2e 100644 --- a/game/client/world/chunk_mesher.cc +++ b/game/client/world/chunk_mesher.cc @@ -39,9 +39,9 @@ static const CachedChunkCoord get_cached_cpos(const chunk_pos& pivot, const chun if(pivot != cpos) { chunk_pos delta = pivot - cpos; - delta[0] = math::clamp(delta[0], -1, 1); - delta[1] = math::clamp(delta[1], -1, 1); - delta[2] = math::clamp(delta[2], -1, 1); + delta[0] = glm::clamp(delta[0], -1, 1); + delta[1] = glm::clamp(delta[1], -1, 1); + delta[2] = glm::clamp(delta[2], -1, 1); if(delta[0]) { return nx[delta[0] + 1]; diff --git a/game/client/world/voxel_atlas.cc b/game/client/world/voxel_atlas.cc index a01db12..67832d3 100644 --- a/game/client/world/voxel_atlas.cc +++ b/game/client/world/voxel_atlas.cc @@ -96,12 +96,12 @@ void world::voxel_atlas::create(int width, int height, std::size_t count) // how voxel quad meshes are packed in memory: each texture index is // confined in 11 bits so having bigger atlas planes makes no sense; glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &max_plane_layers); - max_plane_layers = math::clamp(max_plane_layers, 256, 2048); + max_plane_layers = glm::clamp(max_plane_layers, 256, 2048); for(long i = count; i > 0L; i -= max_plane_layers) { AtlasPlane plane = {}; plane.plane_id = planes.size(); - plane.layer_count_max = math::min(max_plane_layers, i); + plane.layer_count_max = glm::min(max_plane_layers, i); plane.layer_count = 0; const std::size_t save_id = plane.plane_id; -- cgit