mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

AnimationEasingDemo: Fix shadowing warnings

Browse source
This commit is contained in:
reuk 2024-06-19 16:00:37 +01:00
parent 308619fb5f
commit df45c4ae9f
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
examples/GUI/AnimationEasingDemo.h
View file

@ -123,7 +123,7 @@ class AnimationSettingsComponent final : public Component
public: public:
explicit AnimationSettingsComponent (const AnimationSettings& settingsIn) explicit AnimationSettingsComponent (const AnimationSettings& settingsIn)
{ {
playbackControls.button.onClick = [&]{ NullCheckedInvocation::invoke (onAnimate); }; playbackControls.button.onClick = [&] { NullCheckedInvocation::invoke (onAnimate); };
durationControls.slider.getValueObject().referTo (settingsIn.durationMs); durationControls.slider.getValueObject().referTo (settingsIn.durationMs);
playbackControls.positionToggle.getToggleStateValue().referTo (settingsIn.shouldAnimatePosition); playbackControls.positionToggle.getToggleStateValue().referTo (settingsIn.shouldAnimatePosition);
@ -514,7 +514,7 @@ protected:
void setCustomSettingsPage (Component& settingsPage) void setCustomSettingsPage (Component& settingsPage)
{ {
customSettingsPage = &settingsPage; customSettingsPage = &settingsPage;
editViewButton.onClick = [&]{ toggleSettingsPage(); }; editViewButton.onClick = [&] { toggleSettingsPage(); };
addChildComponent (settingsPageBackground); addChildComponent (settingsPageBackground);
addChildComponent (customSettingsPage); addChildComponent (customSettingsPage);
@ -596,16 +596,16 @@ class StandardEasingAnimationView final : public AnimationView
public: public:
StandardEasingAnimationView (const AnimationSettings& settings, StandardEasingAnimationView (const AnimationSettings& settings,
ValueAnimatorBuilder::EasingFn easingFunction) ValueAnimatorBuilder::EasingFn easingFunction)
: AnimationView (settings, [=]{ return easingFunction; }) : AnimationView (settings, [=] { return easingFunction; })
{} {}
}; };
class CubicBezierEasingAnimationView final : public AnimationView class CubicBezierEasingAnimationView final : public AnimationView
{ {
public: public:
CubicBezierEasingAnimationView (const AnimationSettings& animationSettings) CubicBezierEasingAnimationView (const AnimationSettings& settings)
: AnimationView (animationSettings, : AnimationView (settings,
[&]{ return Easings::createCubicBezier (bezierCurve.cp1, bezierCurve.cp2); }) [&] { return Easings::createCubicBezier (bezierCurve.cp1, bezierCurve.cp2); })
{ {
settingsPage.graph.onValueChange = [&] { setCubicBezierCurve (settingsPage.graph.getCubicBezierCurve()); }; settingsPage.graph.onValueChange = [&] { setCubicBezierCurve (settingsPage.graph.getCubicBezierCurve()); };
settingsPage.settings.onValueChange = [&] { setCubicBezierCurve (settingsPage.settings.getCubicBezierCurve()); }; settingsPage.settings.onValueChange = [&] { setCubicBezierCurve (settingsPage.settings.getCubicBezierCurve()); };
@ -669,11 +669,11 @@ struct SliderAndLabel final : public Component
class SpringEasingAnimationView final : public AnimationView class SpringEasingAnimationView final : public AnimationView
{ {
public: public:
SpringEasingAnimationView (const AnimationSettings& animationSettings) SpringEasingAnimationView (const AnimationSettings& settings)
: AnimationView (animationSettings, : AnimationView (settings,
[&]{ return Easings::createSpring (SpringEasingOptions{}.withFrequency (getFrequency()) [&] { return Easings::createSpring (SpringEasingOptions{}.withFrequency (getFrequency())
.withAttenuation (getAttenuation()) .withAttenuation (getAttenuation())
.withExtraAttenuationRange (getExtraAttenuationRange())); }) .withExtraAttenuationRange (getExtraAttenuationRange())); })
{ {
setCustomSettingsPage (settingsPage); setCustomSettingsPage (settingsPage);
} }
@ -720,9 +720,9 @@ private:
class BounceOutEasingAnimationView final : public AnimationView class BounceOutEasingAnimationView final : public AnimationView
{ {
public: public:
BounceOutEasingAnimationView (const AnimationSettings& animationSettings) BounceOutEasingAnimationView (const AnimationSettings& settings)
: AnimationView (animationSettings, : AnimationView (settings,
[&]{ return Easings::createBounce (roundToInt (numberOfBounces.slider.getValue())); }) [&] { return Easings::createBounce (roundToInt (numberOfBounces.slider.getValue())); })
{ {
numberOfBounces.label.setText ("Number of bounces", NotificationType::dontSendNotification); numberOfBounces.label.setText ("Number of bounces", NotificationType::dontSendNotification);
numberOfBounces.slider.setRange (1.0, 10.0, 1.0); numberOfBounces.slider.setRange (1.0, 10.0, 1.0);