natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

display liquid oapcities value on tooltip

Browse Source 
define the values instead of using magic numbers
This commit is contained in:
T1ti
2024-07-28 02:06:22 +02:00
parent 2a6ba6901a
commit a0d0ab1730
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/noggit/ui/Water.cpp
View File

@@ -36,7 +36,7 @@ namespace Noggit
, _override_liquid_id(true) , _override_liquid_id(true)
, _override_height(true) , _override_height(true)
, _opacity_mode(river_opacity) , _opacity_mode(river_opacity)
, _custom_opacity_factor(0.0337f) , _custom_opacity_factor(RIVER_OPACITY_VALUE)
, _lock_pos(glm::vec3(0.0f, 0.0f, 0.0f)) , _lock_pos(glm::vec3(0.0f, 0.0f, 0.0f))
, tile(0, 0) , tile(0, 0)
{ {
@@ -182,7 +182,9 @@ namespace Noggit
auto opacity_layout (new QFormLayout (opacity_group)); auto opacity_layout (new QFormLayout (opacity_group));
river_button = new QRadioButton ("River", this); river_button = new QRadioButton ("River", this);
river_button->setToolTip(std::to_string(RIVER_OPACITY_VALUE).c_str());
ocean_button = new QRadioButton ("Ocean", this); ocean_button = new QRadioButton ("Ocean", this);
ocean_button->setToolTip(std::to_string(OCEAN_OPACITY_VALUE).c_str());
custom_button = new QRadioButton ("Custom factor:", this); custom_button = new QRadioButton ("Custom factor:", this);
transparency_toggle = new QButtonGroup (this); transparency_toggle = new QButtonGroup (this);
@@ -360,8 +362,8 @@ namespace Noggit
switch (_opacity_mode) switch (_opacity_mode)
{ {
default: // values found by experimenting default: // values found by experimenting
case river_opacity: return 0.0337f; case river_opacity: return RIVER_OPACITY_VALUE;
case ocean_opacity: return 0.007f; case ocean_opacity: return OCEAN_OPACITY_VALUE;
case custom_opacity: return _custom_opacity_factor; case custom_opacity: return _custom_opacity_factor;
} }
} }

3
src/noggit/ui/Water.h
View File

@@ -60,6 +60,9 @@ namespace Noggit
void crop_water(); void crop_water();
private: private:
static constexpr float RIVER_OPACITY_VALUE = 0.0337f;
static constexpr float OCEAN_OPACITY_VALUE = 0.007f;
float get_opacity_factor() const; float get_opacity_factor() const;
int _liquid_id; int _liquid_id;