Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 20:23:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Curve: Prevent forcing 1.0 min value to 0.99

Browse Source 
The setters are called when the property is first initialized, and before
that its default min and max are 0.0 and 1.0 respectively.

If you configured min_value to 1.0 and max_value to e.g. 3.0, since the
min_value setter can be called before that of max_value (which thus still
defaults to 1.0), the min will be set to 0.99.
Same conflict could happen with a configured max_value of 0 if its setter
is called before that of a valid, negative min value.
This commit is contained in:
Rémi Verschelde 2019-06-21 16:06:59 +02:00
parent 34224d5ce5
commit ee07560abf
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scene/resources/curve.cpp
View File

@ -51,6 +51,7 @@ Curve::Curve() {
_baked_cache_dirty = false;
_min_value = 0;
_max_value = 1;
_minmax_set_once = 0b00;
}
int Curve::add_point(Vector2 p_pos, real_t left_tangent, real_t right_tangent, TangentMode left_mode, TangentMode right_mode) {
@ -282,20 +283,24 @@ void Curve::update_auto_tangents(int i) {
#define MIN_Y_RANGE 0.01
void Curve::set_min_value(float p_min) {
if (p_min > _max_value - MIN_Y_RANGE)
if (_minmax_set_once & 0b11 && p_min > _max_value - MIN_Y_RANGE) {
_min_value = _max_value - MIN_Y_RANGE;
else
} else {
_minmax_set_once |= 0b10; // first bit is "min set"
_min_value = p_min;
}
// Note: min and max are indicative values,
// it's still possible that existing points are out of range at this point.
emit_signal(SIGNAL_RANGE_CHANGED);
}
void Curve::set_max_value(float p_max) {
if (p_max < _min_value + MIN_Y_RANGE)
if (_minmax_set_once & 0b11 && p_max < _min_value + MIN_Y_RANGE) {
_max_value = _min_value + MIN_Y_RANGE;
else
} else {
_minmax_set_once |= 0b01; // second bit is "max set"
_max_value = p_max;
}
emit_signal(SIGNAL_RANGE_CHANGED);
}

1
scene/resources/curve.h
View File

@ -143,6 +143,7 @@ private:
int _bake_resolution;
float _min_value;
float _max_value;
int _minmax_set_once; // Encodes whether min and max have been set a first time, first bit for min and second for max.
};
VARIANT_ENUM_CAST(Curve::TangentMode)