mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-26 15:05:59 +01:00
Bezier: Fix incorrect binary search in bezier approx
This commit is contained in:
parent
9c0e2bba54
commit
64f35c0e31
1 changed files with 12 additions and 9 deletions
|
@ -45,24 +45,27 @@ float CBezierCurve::getXForT(float t) {
|
||||||
|
|
||||||
// Todo: this probably can be done better and faster
|
// Todo: this probably can be done better and faster
|
||||||
float CBezierCurve::getYForPoint(float x) {
|
float CBezierCurve::getYForPoint(float x) {
|
||||||
// binary search for the range UPDOWN X
|
if (x >= 1.0)
|
||||||
float upperT = 1;
|
return 1.0;
|
||||||
float lowerT = 0;
|
|
||||||
float mid = 0.5;
|
|
||||||
|
|
||||||
while (std::abs(upperT - lowerT) > INVBAKEDPOINTS) {
|
// binary search for the range UPDOWN X
|
||||||
if (m_aPointsBaked[((int)(mid * (float)BAKEDPOINTS))].x > x) {
|
int upperT = BAKEDPOINTS - 1;
|
||||||
|
int lowerT = 0;
|
||||||
|
int mid = upperT / 2;
|
||||||
|
|
||||||
|
while (std::abs(upperT - lowerT) > 1) {
|
||||||
|
if (m_aPointsBaked[mid].x > x) {
|
||||||
upperT = mid;
|
upperT = mid;
|
||||||
} else {
|
} else {
|
||||||
lowerT = mid;
|
lowerT = mid;
|
||||||
}
|
}
|
||||||
|
|
||||||
mid = (upperT + lowerT) / 2.f;
|
mid = (upperT + lowerT) / 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
// in the name of performance i shall make a hack
|
// in the name of performance i shall make a hack
|
||||||
const auto LOWERPOINT = &m_aPointsBaked[std::clamp((int)((float)BAKEDPOINTS * lowerT), 0, BAKEDPOINTS - 1)];
|
const auto LOWERPOINT = &m_aPointsBaked[std::clamp(lowerT, 0, BAKEDPOINTS - 1)];
|
||||||
const auto UPPERPOINT = &m_aPointsBaked[std::clamp((int)((float)BAKEDPOINTS * upperT), 0, BAKEDPOINTS - 1)];
|
const auto UPPERPOINT = &m_aPointsBaked[std::clamp(upperT, 0, BAKEDPOINTS - 1)];
|
||||||
|
|
||||||
const auto PERCINDELTA = (x - LOWERPOINT->x) / (UPPERPOINT->x - LOWERPOINT->x);
|
const auto PERCINDELTA = (x - LOWERPOINT->x) / (UPPERPOINT->x - LOWERPOINT->x);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue