Skip to content

Commit

Permalink
style: use constexpr for max lod
Browse files Browse the repository at this point in the history
  • Loading branch information
laurentsenta committed Jan 25, 2025
1 parent 237dc44 commit a61e720
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/terrain_3d_mesh_asset.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Terrain3DMeshAsset::Terrain3DMeshAsset() {
_name = "New Mesh";
_id = 0;

_lod_visibility_ranges.resize(4); // TODO: define this as const.
_lod_visibility_ranges.resize(MAX_LOD_COUNT);
_lod_visibility_ranges.fill(0.f);
}

Expand All @@ -158,7 +158,7 @@ void Terrain3DMeshAsset::clear() {
_maximum_lod = 0;
_shadow_lod = 0;

_lod_visibility_ranges.resize(4); // TODO: define this as const.
_lod_visibility_ranges.resize(MAX_LOD_COUNT);
_lod_visibility_ranges.fill(0.f);

_generated_faces = 2.f;
Expand Down Expand Up @@ -213,7 +213,7 @@ void Terrain3DMeshAsset::set_cast_shadows(const GeometryInstance3D::ShadowCastin
}

void Terrain3DMeshAsset::set_maximum_lod(const int p_lod) {
_maximum_lod = CLAMP(p_lod, 0, MIN(3, get_mesh_count() - 1)); // TODO: use const, 3 is max lod - 1
_maximum_lod = CLAMP(p_lod, 0, MIN(MAX_LOD_COUNT - 1, get_mesh_count() - 1));
LOG(INFO, "Setting maximum LOD: ", _maximum_lod);
emit_signal("instancer_setting_changed");
}
Expand Down Expand Up @@ -307,7 +307,7 @@ void Terrain3DMeshAsset::set_scene_file(const Ref<PackedScene> &p_scene_file) {
}
_meshes.push_back(mesh);

if (_meshes.size() == 4) { // TODO: make this a constant
if (_meshes.size() == MAX_LOD_COUNT) {
break;
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/terrain_3d_mesh_asset.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ class Terrain3DMeshAsset : public Terrain3DAssetResource {
};

private:
static constexpr int MAX_LOD_COUNT = 4;

// Saved data
real_t _height_offset = 0.f;
real_t _visibility_range = 100.f; // TODO: drop and discuss storage migration
Expand Down

0 comments on commit a61e720

Please sign in to comment.