From 3cf19e143f0c14e7aaa49ed5f8c1435272143b04 Mon Sep 17 00:00:00 2001
From: namark <namark@disroot.org>
Date: Sun, 25 Oct 2020 03:40:19 +0400
Subject: [PATCH] Adapting to some changes in libsimple_motion.
---
bunny.cpp | 4 ++--
circular_maze.cpp | 10 ++++------
various_motion.cpp | 12 ++++++------
3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/bunny.cpp b/bunny.cpp
index ead5734..f6d781d 100644
--- a/bunny.cpp
+++ b/bunny.cpp
@@ -256,8 +256,8 @@ void start(Program& program)
return way(0.f,std::sin(ratio * 170 * poke_ratio), std::min(fade, 1.f));
}, 100ms}, 0);
poke = melody(
- poke_motion{float2::zero(), offset/2, 100ms},
- poke_motion{offset/2, float2::zero(), 100ms}
+ poke_motion{100ms, float2::zero(), offset/2},
+ poke_motion{100ms, offset/2, float2::zero()}
);
}
};
diff --git a/circular_maze.cpp b/circular_maze.cpp
index 0832939..2b9a448 100644
--- a/circular_maze.cpp
+++ b/circular_maze.cpp
@@ -506,14 +506,12 @@ void start(Program& program)
auto circular_distance = mod_difference(maze.current_angle, wrap(3/4.f - movement.path, 1.f), 1.f);
auto radial_distance = movement.level - maze.player_level;
radial_motion = melody(
- circular_motion_t{
+ circular_motion_t{ abs(circular_distance) * 10s,
maze.current_angle,
- maze.current_angle + circular_distance,
- abs(circular_distance) * 10s},
- radial_motion_t{
+ maze.current_angle + circular_distance },
+ radial_motion_t{ abs(radial_distance) * 100ms,
maze.player_level,
- movement.level,
- abs(radial_distance) * 100ms}
+ movement.level }
);
}
diff --git a/various_motion.cpp b/various_motion.cpp
index 762fe48..1a6dd70 100644
--- a/various_motion.cpp
+++ b/various_motion.cpp
@@ -4,16 +4,16 @@ using quadratic_move = movement<float, motion::quadratic_curve>;
float block = 0;
auto diagonal_back_and_forth = melody(
- quadratic_move{0,1, 500ms},
- quadratic_move{1,0, 500ms}
+ quadratic_move{500ms, 0,1},
+ quadratic_move{500ms, 1,0}
);
float2 block2 = float2::zero();
auto square_around = melody(
- quadratic_move{0,1, 500ms},
- quadratic_move{0,1, 500ms},
- quadratic_move{1,0, 500ms},
- quadratic_move{1,0, 500ms}
+ quadratic_move{500ms, 0,1},
+ quadratic_move{500ms, 0,1},
+ quadratic_move{500ms, 1,0},
+ quadratic_move{500ms, 1,0}
);
void start(Program& program)
--
GitLab