summaryrefslogtreecommitdiffhomepage
path: root/src/chunk-render.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2023-02-25 21:47:56 +0100
committerStanislaw Halik <sthalik@misaki.pl>2023-02-25 21:56:16 +0100
commitc9431f34e543dc0e6bf564e4ada9574072e92918 (patch)
tree926ed08d8e15a93e946b2adfab725383092e86e5 /src/chunk-render.cpp
parent6a4ac0dc015106801d79cc258b06f896ea0e2716 (diff)
convert to magnum vectors and use shorter syntax
Diffstat (limited to 'src/chunk-render.cpp')
-rw-r--r--src/chunk-render.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/chunk-render.cpp b/src/chunk-render.cpp
index d00424df..48425f72 100644
--- a/src/chunk-render.cpp
+++ b/src/chunk-render.cpp
@@ -45,7 +45,7 @@ auto chunk::ensure_ground_mesh() noexcept -> ground_mesh_tuple
const std::uint8_t i = ground_indexes[k];
const auto& atlas = _ground_atlases[i];
const local_coords pos{i};
- const auto quad = atlas->floor_quad(Vector3(pos.x, pos.y, 0) * TILE_SIZE, TILE_SIZE2);
+ const auto quad = atlas->floor_quad(Vector3(Vector2(pos), 0) * TILE_SIZE, TILE_SIZE2);
const auto texcoords = atlas->texcoords_for_id(_ground_variants[i]);
const float depth = tile_shader::depth_value(pos);
auto& v = vertexes[k];
@@ -88,7 +88,7 @@ auto chunk::ensure_wall_mesh() noexcept -> wall_mesh_tuple
const auto& atlas = _wall_atlases[i];
const auto& variant = _wall_variants[i];
const local_coords pos{i / 2u};
- const auto center = Vector3(pos.x, pos.y, 0) * TILE_SIZE;
+ const auto center = Vector3(Vector2(pos), 0) * TILE_SIZE;
const auto quad = i & 1 ? atlas->wall_quad_W(center, TILE_SIZE) : atlas->wall_quad_N(center, TILE_SIZE);
const float depth = tile_shader::depth_value(pos);
const auto texcoords = atlas->texcoords_for_id(variant);
@@ -133,7 +133,7 @@ auto chunk::ensure_scenery_mesh() noexcept -> scenery_mesh_tuple
const local_coords pos{i};
const auto& atlas = _scenery_atlases[i];
const auto& fr = _scenery_variants[i];
- const auto coord = Vector3(pos.x, pos.y, 0) * TILE_SIZE + Vector3(Vector2(fr.offset), 0);
+ const auto coord = Vector3(Vector2(pos), 0) * TILE_SIZE + Vector3(Vector2(fr.offset), 0);
const auto quad = atlas->frame_quad(coord, fr.r, fr.frame);
const auto& group = atlas->group(fr.r);
const auto texcoords = atlas->texcoords_for_frame(fr.r, fr.frame, !group.mirror_from.isEmpty());