rsx: Add color interpolation animation

- Adds color interpolation and modulation pass and refactors the code a
bit. Elements with this pass applied have their color modulated by the
animated color from the pass. Modulation transform is multiplicative.
This commit is contained in:
kd-11 2020-01-07 17:10:34 +03:00 committed by kd-11
parent 071e73a68e
commit ecf00be155
2 changed files with 114 additions and 24 deletions

View file

@ -1,5 +1,4 @@
#include "stdafx.h" #include "stdafx.h"
#pragma optimize("", off)
#include "overlay_animation.h" #include "overlay_animation.h"
#include "overlay_controls.h" #include "overlay_controls.h"
@ -9,6 +8,38 @@ namespace rsx
{ {
namespace overlays namespace overlays
{ {
void animation_base::begin_animation(u64 frame)
{
frame_start = frame;
frame_end = u64(frame + duration * g_cfg.video.vblank_rate);
}
f32 animation_base::get_progress_ratio(u64 frame) const
{
if (!frame_start)
{
return 0.f;
}
f32 t = f32(frame - frame_start) / (frame_end - frame_start);
switch (type) {
case animation_type::linear:
break;
case animation_type::ease_in_quad:
t = t * t;
break;
case animation_type::ease_out_quad:
t = t * (2.0 - t);
break;
case animation_type::ease_in_out_cubic:
t = t > 0.5 ? 4.0 * std::pow((t - 1.0), 3.0) + 1.0 : 4.0 * std::pow(t, 3.0);
break;
}
return t;
}
void animation_translate::apply(compiled_resource& resource) void animation_translate::apply(compiled_resource& resource)
{ {
if (!active) if (!active)
@ -36,9 +67,7 @@ namespace rsx
if (frame_start == 0) if (frame_start == 0)
{ {
start = current; start = current;
frame_start = frame; begin_animation(frame);
frame_end = u64(frame + duration * g_cfg.video.vblank_rate);
return; return;
} }
@ -49,23 +78,8 @@ namespace rsx
return; return;
} }
f32 t = f32(frame - frame_start) / (frame_end - frame_start); f32 t = get_progress_ratio(frame);
current = lerp(start, end, t);
switch (type) {
case animation_type::linear:
break;
case animation_type::ease_in_quad:
t = t * t;
break;
case animation_type::ease_out_quad:
t = t * (2.0 - t);
break;
case animation_type::ease_in_out_cubic:
t = t > 0.5 ? 4.0 * std::pow((t - 1.0), 3.0) + 1.0 : 4.0 * std::pow(t, 3.0);
break;
}
current = (1.f - t) * start + t * end;
} }
void animation_translate::finish() void animation_translate::finish()
@ -80,5 +94,55 @@ namespace rsx
on_finish(); on_finish();
} }
} }
void animation_color_interpolate::apply(compiled_resource& data)
{
if (!active)
{
return;
}
for (auto& cmd : data.draw_commands)
{
cmd.config.color *= current;
}
}
void animation_color_interpolate::update(u64 frame)
{
if (!active)
{
return;
}
if (frame_start == 0)
{
start = current;
begin_animation(frame);
return;
}
if (frame >= frame_end)
{
finish();
return;
}
f32 t = get_progress_ratio(frame);
current = lerp(start, end, t);
}
void animation_color_interpolate::finish()
{
active = false;
frame_start = 0;
frame_end = 0;
current = end;
if (on_finish)
{
on_finish();
}
}
}; };
} }

View file

@ -19,8 +19,23 @@ namespace rsx
struct animation_base struct animation_base
{ {
protected:
u64 frame_start = 0;
u64 frame_end = 0;
void begin_animation(u64 frame);
f32 get_progress_ratio(u64 frame) const;
template<typename T>
T lerp(const T& a, const T& b, f32 t) const
{
return (a * (1.f - t)) + (b * t);
}
public:
bool active = false; bool active = false;
animation_type type { animation_type::linear }; animation_type type { animation_type::linear };
f32 duration = 1.f; // in seconds
std::function<void()> on_finish; std::function<void()> on_finish;
@ -34,12 +49,23 @@ namespace rsx
vector3f start{}; // Set `current` instead of this vector3f start{}; // Set `current` instead of this
// NOTE: Necessary because update() is called after rendering, // NOTE: Necessary because update() is called after rendering,
// resulting in one frame of incorrect translation // resulting in one frame of incorrect translation
u64 frame_start = 0;
u64 frame_end = 0;
public: public:
vector3f current{}; vector3f current{};
vector3f end{}; vector3f end{};
f32 duration{}; // in seconds
void apply(compiled_resource& data) override;
void update(u64 frame) override;
void finish();
};
struct animation_color_interpolate : animation_translate
{
private:
color4f start{};
public:
color4f current{};
color4f end{};
void apply(compiled_resource& data) override; void apply(compiled_resource& data) override;
void update(u64 frame) override; void update(u64 frame) override;