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

Support ui animations

Browse source
This commit is contained in:
Nikita Lisitsa 2021-03-05 20:09:02 +03:00
parent bcba2893bf
commit 2b2b2be560
5 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/app/include/psemek/app/ui_scene.hpp
View file

@ -4,6 +4,8 @@
#include <psemek/ui/controller.hpp>
#include <psemek/util/clock.hpp>
namespace psemek::app
{
@ -42,6 +44,8 @@ namespace psemek::app
private:
ui::controller & controller_;
std::shared_ptr<ui::element> ui_;
util::clock<std::chrono::duration<float>, std::chrono::high_resolution_clock> update_clock_;
};
}

2
libs/app/source/ui_scene.cpp
View file

@ -11,6 +11,7 @@ namespace psemek::app
{
scene_base::on_scene_enter(parent);
controller_.set_root(ui_);
update_clock_.restart();
}
void ui_scene::on_scene_exit()
@ -87,6 +88,7 @@ namespace psemek::app
void ui_scene::update()
{
controller_.update(update_clock_.restart().count());
controller_.loop()->pump();
}

2
libs/ui/include/psemek/ui/controller.hpp
View file

@ -25,6 +25,8 @@ namespace psemek::ui
bool event(mouse_wheel const & e);
bool event(key_press const & e);
void update(float dt);
void render(gfx::render_target const & rt);
private:

2
libs/ui/include/psemek/ui/element.hpp
View file

@ -50,6 +50,8 @@ namespace psemek::ui
virtual std::shared_ptr<struct style const> set_style(std::shared_ptr<struct style const> st);
virtual std::shared_ptr<struct style const> merged_style() const;
virtual void update(float /* dt */) {}
virtual void draw(painter & p) const = 0;
virtual ~element() {}

19
libs/ui/source/controller.cpp
View file

@ -62,6 +62,8 @@ namespace psemek::ui
template <typename E>
bool event(E const & e);
void update(float dt);
};
controller::impl::impl(async::event_loop * loop)
@ -91,6 +93,18 @@ namespace psemek::ui
return false;
}
void controller::impl::update(float dt)
{
auto visitor = util::recursive([dt](auto && self, element * elem) -> void {
if (elem->enabled()) elem->update(dt);
for (auto c : elem->children())
if (c) self(c);
});
if (root)
visitor(root.get());
}
controller::controller(async::event_loop * loop)
: pimpl_{make_impl(loop)}
{}
@ -149,6 +163,11 @@ namespace psemek::ui
return impl().event(e);
}
void controller::update(float dt)
{
impl().update(dt);
}
void controller::render(gfx::render_target const & rt)
{
rt.bind();