Skip to content

Enhance burn #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
soreau merged 2 commits into from
Dec 13, 2025
Merged

Enhance burn #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
960703e
extra-animations: burn: Make smoothness settings more distinguished
soreau Dec 13, 2025
a4d8435
extra-animations: burn: Enhance effect by allowing flames to overflow…
soreau Dec 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion metadata/extra-animations.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<option name="burn_flame_speed" type="double">
<_short>Burn flame speed</_short>
<_long>The speed at which the flames flicker.</_long>
<default>5</default>
<default>7</default>
<min>1</min>
<max>100</max>
<precision>1</precision>
Expand Down
41 changes: 29 additions & 12 deletions src/extra-animations/burn.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,16 @@ void main()

vec3 col = vec3(1.5 * c1, 1.5 * c1 * c1 * c1, c1 * c1 * c1 * c1 * c1 * c1);

float a = clamp(c * (1.0 - pow(uvpos.y, 3.0)), 0.0, 1.0);
float a = clamp(c * (1.0 - pow(uvpos.y, 10.0)), 0.0, 1.0);
vec4 wfrag = get_pixel(uvpos);
float wa = wfrag.a;
if (uvpos.y < progress)
{
wfrag = vec4(0.0);
}
a *= clamp(progress * 10.0, 0.0, 1.0);
vec4 color = vec4(col * wa, wa) * a;
a *= clamp(uvpos.x * (width / 30.0), 0.0, 1.0);
a *= clamp((1.0 - uvpos.x) * (width / 30.0), 0.0, 1.0);
vec4 color = vec4(col * a, a);
gl_FragColor = color + wfrag * (1.0 - a);
}
)";
Expand Down Expand Up @@ -223,7 +224,7 @@ class burn_transformer : public wf::scene::view_2d_transformer_t
void render(const wf::scene::render_instruction_t& data) override
{
auto bb = self->get_children_bounding_box();
auto pbb = self->get_bounding_box();
auto pbb = self->get_padded_bounding_box();
auto tex = wf::gles_texture_t{get_texture(1.0)};

const float vertices[] = {
Expand Down Expand Up @@ -261,16 +262,16 @@ class burn_transformer : public wf::scene::view_2d_transformer_t
self->program.uniform1f("flame_height", burn_flame_height);
if (std::string(burn_flame_smoothness) == "softest")
{
self->program.uniform1i("flame_smooth_1", 1);
self->program.uniform1i("flame_smooth_1", 0);
self->program.uniform1i("flame_smooth_2", 0);
self->program.uniform1i("flame_smooth_3", 0);
self->program.uniform1i("flame_smooth_4", 0);
} else if (std::string(burn_flame_smoothness) == "soft")
{
self->program.uniform1i("flame_smooth_1", 1);
self->program.uniform1i("flame_smooth_2", 0);
self->program.uniform1i("flame_smooth_1", 0);
self->program.uniform1i("flame_smooth_2", 1);
self->program.uniform1i("flame_smooth_3", 1);
self->program.uniform1i("flame_smooth_4", 0);
self->program.uniform1i("flame_smooth_4", 1);
} else if (std::string(burn_flame_smoothness) == "hard")
{
self->program.uniform1i("flame_smooth_1", 1);
Expand All @@ -280,9 +281,9 @@ class burn_transformer : public wf::scene::view_2d_transformer_t
} else // "normal"
{
self->program.uniform1i("flame_smooth_1", 1);
self->program.uniform1i("flame_smooth_2", 1);
self->program.uniform1i("flame_smooth_3", 0);
self->program.uniform1i("flame_smooth_4", 1);
self->program.uniform1i("flame_smooth_2", 0);
self->program.uniform1i("flame_smooth_3", 1);
self->program.uniform1i("flame_smooth_4", 0);
}

self->program.set_active_texture(tex);
Expand All @@ -294,7 +295,7 @@ class burn_transformer : public wf::scene::view_2d_transformer_t
wf::gles::render_target_logic_scissor(data.target, wlr_box_from_pixman_box(box));
OpenGL::render_transformed_texture(final_tex, pbb,
wf::gles::render_target_orthographic_projection(data.target),
glm::vec4(1.0, 1.0, 1.0, 1.0 / (1.0 + pow(2.718, -(progress * 15.0 - 3.0)))), 0);
glm::vec4(1.0, 1.0, 1.0, std::clamp((progress - 0.07) * 10.0, 0.0, 1.0)), 0);
}

GL_CALL(glBindTexture(GL_TEXTURE_2D, 0));
Expand All @@ -321,6 +322,22 @@ class burn_transformer : public wf::scene::view_2d_transformer_t
});
}

wf::geometry_t get_padded_bounding_box()
{
auto box = this->get_children_bounding_box();
auto padding = 50;
box.x -= padding;
box.y -= padding;
box.width += padding * 2;
box.height += padding * 2;
return box;
}

wf::geometry_t get_bounding_box() override
{
return get_padded_bounding_box();
}

wf::effect_hook_t pre_hook = [=] ()
{
output->render->damage(this->get_bounding_box());
Expand Down