Skip to content
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

Jump to bottom

animate: Add helix animation #2417

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

animate: Add helix animation #2417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
40f861d
animate: Prepare for helix animation
soreau Jul 29, 2024
685cc3a
Add helix.hpp
soreau Jul 30, 2024
580b8ee
helix: Animate strips
soreau Jul 30, 2024
9fa1076
Use more unique name for transformer name variable
soreau Jul 30, 2024
3228d19
helix: Fix up y flip
soreau Aug 1, 2024
bbe4543
helix: Match beginning animation geometry with geometry used during
soreau Aug 4, 2024
d494c7c
helix: Move transformer name variable within plugin namespace
soreau Aug 28, 2024
e0a1932
helix: Overhaul
soreau Aug 28, 2024
e404d0e
helix: Change default duration to 250ms
soreau Aug 28, 2024
edc449e
helix: Add rotations and strip height options
soreau Aug 28, 2024
d81d51a
helix: Move shader program uploads outside of damage region loop
soreau Aug 28, 2024
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
25 changes: 25 additions & 0 deletions metadata/animate.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
<value>spin</value>
<_name>Spin</_name>
</desc>
<desc>
<value>helix</value>
<_name>Helix</_name>
</desc>
</option>
<option name="close_animation" type="string">
<_short>Close animation</_short>
Expand Down Expand Up @@ -62,6 +66,10 @@
<value>spin</value>
<_name>Spin</_name>
</desc>
<desc>
<value>helix</value>
<_name>Helix</_name>
</desc>
</option>
<option name="minimize_animation" type="string">
<_short>Minimze animation</_short>
Expand Down Expand Up @@ -169,5 +177,22 @@
<_long>Number of rotations for the spin animation. Negative values reverse the spin direction.</_long>
<default>1</default>
</option>
<option name="helix_duration" type="animation">
<_short>Helix duration</_short>
<_long>Sets the duration for the helix animation in milliseconds.</_long>
<default>250ms linear</default>
</option>
<option name="helix_rotations" type="int">
<_short>Helix rotations</_short>
<_long>Number of rotations for the helix animation.</_long>
<default>1</default>
<min>1</min>
</option>
<option name="helix_strip_height" type="int">
<_short>Helix strip height</_short>
<_long>Height of each helix strip in pixels.</_long>
<default>20</default>
<min>10</min>
</option>
</plugin>
</wayfire>
9 changes: 9 additions & 0 deletions plugins/animate/animate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "squeezimize.hpp"
#include "zap.hpp"
#include "spin.hpp"
#include "helix.hpp"
#include "fire/fire.hpp"
#include "unmapped-view-node.hpp"
#include "wayfire/plugin.hpp"
Expand Down Expand Up @@ -428,6 +429,10 @@ class wayfire_animation : public wf::plugin_interface_t, private wf::per_output_
{
set_animation<wf::spin::spin_animation>(ev->view, ANIMATION_TYPE_MAP,
animation.duration, animation.animation_name);
} else if (animation.animation_name == "helix")
{
set_animation<wf::helix::helix_animation>(ev->view, ANIMATION_TYPE_MAP,
animation.duration, animation.animation_name);
}
};

Expand Down Expand Up @@ -456,6 +461,10 @@ class wayfire_animation : public wf::plugin_interface_t, private wf::per_output_
{
set_animation<wf::spin::spin_animation>(ev->view, ANIMATION_TYPE_UNMAP,
animation.duration, animation.animation_name);
} else if (animation.animation_name == "helix")
{
set_animation<wf::helix::helix_animation>(ev->view, ANIMATION_TYPE_UNMAP,
animation.duration, animation.animation_name);
}
};

Expand Down
Loading
Loading