Fixed bookmark jump transition bug
This commit is contained in:
parent
bacca9ff68
commit
4aa810fe43
7 changed files with 21 additions and 9 deletions
|
|
@ -3,6 +3,7 @@
|
||||||
#include "Helpers/FixedPoint.hpp"
|
#include "Helpers/FixedPoint.hpp"
|
||||||
#include "Helpers/MathExtras.hpp"
|
#include "Helpers/MathExtras.hpp"
|
||||||
#include "MainProgram.hpp"
|
#include "MainProgram.hpp"
|
||||||
|
#include "TimePoint.hpp"
|
||||||
#include "World.hpp"
|
#include "World.hpp"
|
||||||
#include "InputManager.hpp"
|
#include "InputManager.hpp"
|
||||||
#include <Helpers/Logger.hpp>
|
#include <Helpers/Logger.hpp>
|
||||||
|
|
@ -65,7 +66,7 @@ void DrawCamera::scale_up(World& w, const WorldScalar& scaleUpAmount) {
|
||||||
void DrawCamera::update_main(World& w) {
|
void DrawCamera::update_main(World& w) {
|
||||||
if(smoothMove.occurring) {
|
if(smoothMove.occurring) {
|
||||||
BezierEasing zoomAnim{w.main.conf.jumpTransitionEasing};
|
BezierEasing zoomAnim{w.main.conf.jumpTransitionEasing};
|
||||||
float smoothTime = smooth_two_way_time(smoothMove.moveTime, w.main.deltaTime, true, w.main.conf.jumpTransitionTime);
|
float smoothTime = smooth_two_way_animation_time_get_lerp(smoothMove.moveTime, w.main.deltaTime, true, w.main.conf.jumpTransitionTime);
|
||||||
float lerpTime;
|
float lerpTime;
|
||||||
float rotationLerpTime = zoomAnim(smoothTime);
|
float rotationLerpTime = zoomAnim(smoothTime);
|
||||||
lerpTime = zoomAnim(smoothTime);
|
lerpTime = zoomAnim(smoothTime);
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ void CheckBox::layout(const Clay_ElementId& id, const std::function<bool()>& isT
|
||||||
}
|
}
|
||||||
|
|
||||||
void CheckBox::update() {
|
void CheckBox::update() {
|
||||||
if(smooth_two_way_time(hoverAnimation, gui.io.deltaTime, mouseHovering, CHECKBOX_ANIMATION_TIME))
|
if(smooth_two_way_animation_time_check_for_change(hoverAnimation, gui.io.deltaTime, mouseHovering, CHECKBOX_ANIMATION_TIME))
|
||||||
gui.invalidate_draw_element(this);
|
gui.invalidate_draw_element(this);
|
||||||
if(oldIsTicked != isTicked()) {
|
if(oldIsTicked != isTicked()) {
|
||||||
gui.invalidate_draw_element(this);
|
gui.invalidate_draw_element(this);
|
||||||
|
|
|
||||||
|
|
@ -34,8 +34,8 @@ template <typename T> class NumberSlider : public Element {
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void update() {
|
virtual void update() {
|
||||||
smooth_two_way_time(dd.holdAnimation, gui.io.deltaTime, dd.isHeld, HOLD_ANIMATION_TIME);
|
smooth_two_way_animation_time(dd.holdAnimation, gui.io.deltaTime, dd.isHeld, HOLD_ANIMATION_TIME);
|
||||||
smooth_two_way_time(dd.hoverAnimation, gui.io.deltaTime, mouseHovering, gui.io.theme->hoverExpandTime);
|
smooth_two_way_animation_time(dd.hoverAnimation, gui.io.deltaTime, mouseHovering, gui.io.theme->hoverExpandTime);
|
||||||
if(oldDD != dd) {
|
if(oldDD != dd) {
|
||||||
gui.invalidate_draw_element(this, {
|
gui.invalidate_draw_element(this, {
|
||||||
.top = 10.0f,
|
.top = 10.0f,
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ void RadioButton::layout(const Clay_ElementId& id, const std::function<bool()>&
|
||||||
}
|
}
|
||||||
|
|
||||||
void RadioButton::update() {
|
void RadioButton::update() {
|
||||||
if(smooth_two_way_time(hoverAnimation, gui.io.deltaTime, mouseHovering, RADIOBUTTON_ANIMATION_TIME))
|
if(smooth_two_way_animation_time_check_for_change(hoverAnimation, gui.io.deltaTime, mouseHovering, RADIOBUTTON_ANIMATION_TIME))
|
||||||
gui.invalidate_draw_element(this);
|
gui.invalidate_draw_element(this);
|
||||||
if(oldIsTicked != isTicked()) {
|
if(oldIsTicked != isTicked()) {
|
||||||
gui.invalidate_draw_element(this);
|
gui.invalidate_draw_element(this);
|
||||||
|
|
|
||||||
|
|
@ -71,11 +71,11 @@ void MainProgram::update() {
|
||||||
while(std::chrono::duration_cast<std::chrono::duration<float>>(std::chrono::steady_clock::now() - lastFrameTime).count() < 1.0 / conf.fpsLimit);
|
while(std::chrono::duration_cast<std::chrono::duration<float>>(std::chrono::steady_clock::now() - lastFrameTime).count() < 1.0 / conf.fpsLimit);
|
||||||
lastFrameTime = std::chrono::steady_clock::now();
|
lastFrameTime = std::chrono::steady_clock::now();
|
||||||
|
|
||||||
input.update();
|
|
||||||
|
|
||||||
deltaTime.update_time_since();
|
deltaTime.update_time_since();
|
||||||
deltaTime.update_time_point();
|
deltaTime.update_time_point();
|
||||||
|
|
||||||
|
input.update();
|
||||||
|
|
||||||
g.update();
|
g.update();
|
||||||
toolbar.update();
|
toolbar.update();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ TimePoint::operator float() const {
|
||||||
return get_time_since();
|
return get_time_since();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool smooth_two_way_time(float& timeToUpdate, float deltaTime, bool isWay1, float animDuration) {
|
bool smooth_two_way_animation_time_check_for_change(float& timeToUpdate, float deltaTime, bool isWay1, float animDuration) {
|
||||||
float newTimeToUpdate = std::clamp(isWay1 ? (timeToUpdate + deltaTime) : (timeToUpdate - deltaTime), 0.0f, animDuration);
|
float newTimeToUpdate = std::clamp(isWay1 ? (timeToUpdate + deltaTime) : (timeToUpdate - deltaTime), 0.0f, animDuration);
|
||||||
if(newTimeToUpdate != timeToUpdate) {
|
if(newTimeToUpdate != timeToUpdate) {
|
||||||
timeToUpdate = newTimeToUpdate;
|
timeToUpdate = newTimeToUpdate;
|
||||||
|
|
@ -30,6 +30,15 @@ bool smooth_two_way_time(float& timeToUpdate, float deltaTime, bool isWay1, floa
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
float smooth_two_way_animation_time_get_lerp(float& timeToUpdate, float deltaTime, bool isWay1, float animDuration) {
|
||||||
|
timeToUpdate = std::clamp(isWay1 ? (timeToUpdate + deltaTime) : (timeToUpdate - deltaTime), 0.0f, animDuration);
|
||||||
|
return timeToUpdate / animDuration;
|
||||||
|
}
|
||||||
|
|
||||||
|
void smooth_two_way_animation_time(float& timeToUpdate, float deltaTime, bool isWay1, float animDuration) {
|
||||||
|
timeToUpdate = std::clamp(isWay1 ? (timeToUpdate + deltaTime) : (timeToUpdate - deltaTime), 0.0f, animDuration);
|
||||||
|
}
|
||||||
|
|
||||||
WorldVec lerp_world_vec_double(const WorldVec& v1, const WorldVec& v2, double t) {
|
WorldVec lerp_world_vec_double(const WorldVec& v1, const WorldVec& v2, double t) {
|
||||||
return {FixedPoint::lerp_double(v1.x(), v2.x(), t), FixedPoint::lerp_double(v1.y(), v2.y(), t)};
|
return {FixedPoint::lerp_double(v1.x(), v2.x(), t), FixedPoint::lerp_double(v1.y(), v2.y(), t)};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,9 @@ template<typename TimeType> SkColor4f lerp_vec(const SkColor4f& t1, const SkColo
|
||||||
std::lerp(t1[3], t2[3], t)};
|
std::lerp(t1[3], t2[3], t)};
|
||||||
}
|
}
|
||||||
|
|
||||||
bool smooth_two_way_time(float& timeToUpdate, float deltaTime, bool isWay1, float animDuration);
|
bool smooth_two_way_animation_time_check_for_change(float& timeToUpdate, float deltaTime, bool isWay1, float animDuration);
|
||||||
|
float smooth_two_way_animation_time_get_lerp(float& timeToUpdate, float deltaTime, bool isWay1, float animDuration);
|
||||||
|
void smooth_two_way_animation_time(float& timeToUpdate, float deltaTime, bool isWay1, float animDuration);
|
||||||
|
|
||||||
class TimePoint {
|
class TimePoint {
|
||||||
public:
|
public:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue