From db01a6ed506ea2352b20f10b2694e249d2bba6c5 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 12 Nov 2022 17:40:28 +0200
Subject: [PATCH] Cosmetic tweaks

---
 examples/bassteroids/source/gamecontroller.cpp |  4 ++--
 examples/bassteroids/source/physics.cpp        |  3 +--
 source/game/eventbus.h                         |  6 +++---
 source/game/eventsource.h                      | 16 ++++++++--------
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/examples/bassteroids/source/gamecontroller.cpp b/examples/bassteroids/source/gamecontroller.cpp
index 05586b0..eae5e2d 100644
--- a/examples/bassteroids/source/gamecontroller.cpp
+++ b/examples/bassteroids/source/gamecontroller.cpp
@@ -8,8 +8,8 @@ using namespace Msp;
 
 GameController::GameController(Game::Stage &s):
 	System(s),
-	asteroid_setup{ .physical = { .body = { .mass = 200 }, .collider = { .type = ColliderType::CIRCLE, .radius = 3.0f } },
-		.mesh = { .object_name = "Asteroid 1.object" }}
+	asteroid_setup{ .physical={ .body={ .mass=200 }, .collider={ .type=ColliderType::CIRCLE, .radius=3.0f } },
+		.mesh={ .object_name="Asteroid 1.object" }}
 { }
 
 void GameController::tick(Time::TimeDelta)
diff --git a/examples/bassteroids/source/physics.cpp b/examples/bassteroids/source/physics.cpp
index 429715a..89feeed 100644
--- a/examples/bassteroids/source/physics.cpp
+++ b/examples/bassteroids/source/physics.cpp
@@ -193,9 +193,8 @@ void Physics::collide_circle_circle(unsigned i, unsigned j)
 	if(d_sq<r_sum*r_sum)
 	{
 		Collision &collision = get_collision(i, j);
-		float d = sqrt(d_sq);
 		collision.normal = normalize(delta);
-		collision.depth = r1+r2-d;
+		collision.depth = r1+r2-sqrt(d_sq);
 		collision.point = pos1-collision.normal*(r1-collision.depth/2);
 		if(collision.body1!=i)
 			collision.normal = -collision.normal;
diff --git a/source/game/eventbus.h b/source/game/eventbus.h
index c78cb0d..7da047e 100644
--- a/source/game/eventbus.h
+++ b/source/game/eventbus.h
@@ -52,12 +52,12 @@ public:
 
 private:
 	template<typename T>
-	EventDispatcher<T> &get_emitter();
+	EventDispatcher<T> &get_dispatcher();
 
 public:
 	template<typename T>
 	void add_observer(EventObserver &obs, std::function<void(const T &)> cb)
-	{ get_emitter<T>().add_observer(&obs, std::move(cb)); }
+	{ get_dispatcher<T>().add_observer(&obs, std::move(cb)); }
 
 	void replace_observer(EventObserver &, EventObserver &);
 	void remove_observer(EventObserver &);
@@ -83,7 +83,7 @@ inline unsigned EventBus::get_event_id()
 }
 
 template<typename T>
-inline EventDispatcher<T> &EventBus::get_emitter()
+inline EventDispatcher<T> &EventBus::get_dispatcher()
 {
 	unsigned id = get_event_id<T>();
 	if(dispatchers.size()<=id)
diff --git a/source/game/eventsource.h b/source/game/eventsource.h
index 5dacbee..0856e08 100644
--- a/source/game/eventsource.h
+++ b/source/game/eventsource.h
@@ -44,6 +44,14 @@ public:
 };
 
 
+template<typename... E>
+template<typename T>
+inline void EventSource<E...>::cancel_observation()
+{
+	for(const auto &h: static_cast<EventDispatcher<T> &>(*this).handlers)
+		h.observer->remove_source(*this);
+}
+
 template<typename... E>
 template<typename T, typename... Args>
 inline void EventSource<E...>::emit(Args &&... args) const
@@ -53,14 +61,6 @@ inline void EventSource<E...>::emit(Args &&... args) const
 	bus.dispatch(event);
 }
 
-template<typename... E>
-template<typename T>
-inline void EventSource<E...>::cancel_observation()
-{
-	for(const auto &h: static_cast<EventDispatcher<T> &>(*this).handlers)
-		h.observer->remove_source(*this);
-}
-
 } // namespace Msp::Game
 
 #endif
-- 
2.43.0