lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support animating ui::move

Browse source
This commit is contained in:
Nikita Lisitsa 2024-08-07 18:47:57 +03:00
parent 611dc959da
commit f69657c826
3 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/ui/include/psemek/ui/impl/move_base.hpp
View file

@ -18,12 +18,16 @@ namespace psemek::ui::impl
void set_child(std::unique_ptr<component> child) override; void set_child(std::unique_ptr<component> child) override;
std::unique_ptr<component> release_child() override; std::unique_ptr<component> release_child() override;
void animate(float dt) override;
void update(move const & value); void update(move const & value);
private: private:
react::source<react::value<geom::vector<float, 2>>> offset_; react::value<geom::vector<float, 2>> offset_;
react::value<float> animation_speed_;
react::source<react::value<struct size_constraints>> child_size_constraints_; react::source<react::value<struct size_constraints>> child_size_constraints_;
react::value<struct size_constraints> size_constraints_; react::value<struct size_constraints> size_constraints_;
geom::vector<float, 2> current_offset_;
}; };
} }

1
libs/ui/include/psemek/ui/move.hpp
View file

@ -12,6 +12,7 @@ namespace psemek::ui
{ {
react::value<std::any> child = {}; react::value<std::any> child = {};
react::value<geom::vector<float, 2>> offset = geom::vector{0.f, 0.f}; react::value<geom::vector<float, 2>> offset = geom::vector{0.f, 0.f};
react::value<float> animation_speed = 0.f;
}; };
} }

32
libs/ui/source/impl/move_base.cpp
View file

@ -17,8 +17,10 @@ namespace psemek::ui::impl
move_base::move_base() move_base::move_base()
: offset_({0.f, 0.f}) : offset_({0.f, 0.f})
, animation_speed_(0.f)
, child_size_constraints_(size_constraints::max()) , child_size_constraints_(size_constraints::max())
, size_constraints_(react::join(child_size_constraints_)) , size_constraints_(react::join(child_size_constraints_))
, current_offset_{0.f, 0.f}
{} {}
void move_base::reshape(geom::box<float, 2> const & new_shape) void move_base::reshape(geom::box<float, 2> const & new_shape)
@ -26,7 +28,7 @@ namespace psemek::ui::impl
single_container::reshape(new_shape); single_container::reshape(new_shape);
if (auto child = this->child()) if (auto child = this->child())
child->reshape(compute_child_shape(new_shape, **offset_)); child->reshape(compute_child_shape(new_shape, current_offset_));
} }
react::value<struct size_constraints> move_base::size_constraints() const react::value<struct size_constraints> move_base::size_constraints() const
@ -49,9 +51,35 @@ namespace psemek::ui::impl
return single_container::release_child(); return single_container::release_child();
} }
void move_base::animate(float dt)
{
if (*animation_speed_ == 0.f)
{
if (current_offset_ != *offset_)
{
current_offset_ = *offset_;
reshape(shape());
}
}
else
{
auto factor = - std::expm1(- dt * (*animation_speed_));
auto new_offset = geom::lerp(current_offset_, *offset_, factor);
if (geom::length(current_offset_ - new_offset) < 1.f / 16.f)
new_offset = *offset_;
if (current_offset_ != *offset_)
{
current_offset_ = new_offset;
reshape(shape());
}
}
}
void move_base::update(move const & value) void move_base::update(move const & value)
{ {
offset_.set(value.offset); offset_ = value.offset;
animation_speed_ = value.animation_speed;
} }
} }