Merge pull request #5 from cpp-gamedev/shape

improved blinking

Author: NikolaJelic

src/gfx/follow_eye.cpp

@@ -6,19 +6,23 @@
 namespace misc {
 sf::Vector2f follow_eye_t::update(sf::Vector2f target) noexcept { return (dir = maths::normalize(target - pos)); }
 void follow_eye_t::draw(drawer_t& drawer, bool blink) {
-	shape_t<sf::CircleShape> circle(drawer);
-	circle.radius = 40.0f * scale;
-	circle.outline = {sf::Color(0x221100ff), 2.0f};
-	circle.position = pos;
-	circle.draw();
+	shape_t<sf::CircleShape> eye(drawer);
+	eye.radius = 40.f * scale;
+	eye.position = pos;
 	if (!blink) {
-		auto const radius = circle.radius * 0.25f;
-		auto const offset = dir * (circle.radius - radius) * 0.80f; // 20% padding
-		circle.radius = radius;
-		circle.fill = sf::Color::Black;
-		circle.outline.size = 0.0f;
-		circle.position += offset;
-		circle.draw();
+		eye.outline = {sf::Color(0x221100ff), 2.0f};
+		eye.draw();
+		// pupil
+		auto const offset = dir * (eye.radius * 0.75f) * 0.80f; // 20% padding
+		eye.radius *= 0.3f;
+		eye.fill = sf::Color::Black;
+		eye.outline = {sf::Color(0x221100ff), 0.5f};
+		eye.position += offset;
+		eye.draw();
+	} else {
+		eye.scale = {1.0f, 0.1f};
+		eye.fill = sf::Color::Black;
+		eye.draw();
 	}
 }
 } // namespace misc

src/main.cpp

@@ -81,7 +81,7 @@ class clock_ticker_t {
 
 	struct {
 		pair_t<sec_t> interval = {sec_t{3.0f}, sec_t{8.0f}};
-		sec_t duration = sec_t{0.15f};
+		sec_t duration = sec_t{0.1f};
 
 		sec_t next_blink_in{};
 		sec_t stop_blink_in{};