Put simple constructor definitions in headers

diff --git a/source/game/component.cpp b/source/game/component.cpp
deleted file mode 100644 (file)
index ae2aba8..0000000
--- a/source/game/component.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "component.h"
-
-namespace Msp::Game {
-
-Component::Component(Handle<Entity> e):
-       entity(e)
-{ }
-
-} // namespace Msp::Game

diff --git a/source/game/component.h b/source/game/component.h
index b81251df983639213d15a7b205d2c2adda4efcf1..d4a7b67a6b96e68a7e5d0d99fe41efc2583da449 100644 (file)
--- a/source/game/component.h
+++ b/source/game/component.h
@@ -18,7 +18,7 @@ public:
 protected:
        Handle<Entity> entity;
 
-       Component(Handle<Entity>);
+       Component(Handle<Entity> e): entity(e) { }
 public:
        virtual ~Component() = default;
 

diff --git a/source/game/eventobserver.cpp b/source/game/eventobserver.cpp
index 440d2994b776e340f16064cc72869bc89ed20d81..5313c3231ed4022eae1e35bb6e27e5deeed4dd07 100644 (file)
--- a/source/game/eventobserver.cpp
+++ b/source/game/eventobserver.cpp
@@ -3,10 +3,6 @@
 
 namespace Msp::Game {
 
-EventObserver::EventObserver(EventBus &b):
-       bus(b)
-{ }
-
 EventObserver::~EventObserver()
 {
        bus.remove_observer(*this);

diff --git a/source/game/eventobserver.h b/source/game/eventobserver.h
index 1c6551477ec02393f294dd9c260c9fc71f8e8084..08ad8927ac03b3afd0ac857275bcbb6c628bde81 100644 (file)
--- a/source/game/eventobserver.h
+++ b/source/game/eventobserver.h
@@ -17,7 +17,7 @@ private:
        std::vector<EventSourceBase *> observed_sources;
 
 public:
-       EventObserver(EventBus &);
+       EventObserver(EventBus &b): bus(b) { }
        ~EventObserver();
 
        template<typename T>

diff --git a/source/game/light.cpp b/source/game/light.cpp
index 1afa519a46e63d748794ce78d578561b06c494f6..12dafdf2b27d4533967718cddf9cba181f4872a4 100644 (file)
--- a/source/game/light.cpp
+++ b/source/game/light.cpp
@@ -2,11 +2,6 @@
 
 namespace Msp::Game {
 
-Light::Light(Handle<Entity> e, const Setup &s):
-       Component(e),
-       setup(s)
-{ }
-
 unsigned Light::get_shadow_map_size(unsigned base) const
 {
        if(setup.shadow_detail<0)

diff --git a/source/game/light.h b/source/game/light.h
index 5787db0393937474d4e2070c4a75382670998160..e0df2d8666aa12832a84fd60ce717ceefa578943 100644 (file)
--- a/source/game/light.h
+++ b/source/game/light.h
@@ -16,7 +16,7 @@ private:
        const Setup &setup;
 
 public:
-       Light(Handle<Entity>, const Setup &);
+       Light(Handle<Entity> e, const Setup &s): Component(e), setup(s) { }
 
        LightType get_type() const { return setup.type; }
        float get_intensity() const { return setup.intensity; }

diff --git a/source/game/meshsource.cpp b/source/game/meshsource.cpp
deleted file mode 100644 (file)
index a59343e..0000000
--- a/source/game/meshsource.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "meshsource.h"
-
-namespace Msp::Game {
-
-} // namespace Msp::Game

diff --git a/source/game/shadowtarget.cpp b/source/game/shadowtarget.cpp
deleted file mode 100644 (file)
index 61dd64d..0000000
--- a/source/game/shadowtarget.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "shadowtarget.h"
-
-namespace Msp::Game {
-
-ShadowTarget::ShadowTarget(Handle<Entity> e, const Setup &setup):
-       Component(e),
-       radius(setup.radius)
-{ }
-
-} // namespace Msp::Game

diff --git a/source/game/shadowtarget.h b/source/game/shadowtarget.h
index a5d7fbdfff0760163ab22a03e6935742f8312c3b..aa3e0a86a062e4c2725da6f238223b59382ec5e2 100644 (file)
--- a/source/game/shadowtarget.h
+++ b/source/game/shadowtarget.h
@@ -15,7 +15,7 @@ private:
        float radius;
 
 public:
-       ShadowTarget(Handle<Entity>, const Setup &);
+       ShadowTarget(Handle<Entity> e, const Setup &s): Component(e), radius(s.radius) { }
 
        float get_radius() const { return radius; }
 };

diff --git a/source/game/systemscheduler.cpp b/source/game/systemscheduler.cpp
index d6fb9a55e6b0f80b2984b15ab55c0693622a9669..1ad2ea5e06a81db5cd8e269c1e40fdf7097ad722 100644 (file)
--- a/source/game/systemscheduler.cpp
+++ b/source/game/systemscheduler.cpp
@@ -8,10 +8,6 @@ using namespace std;
 
 namespace Msp::Game {
 
-SystemScheduler::SystemScheduler(Reflection::Reflector &r):
-       reflector(r)
-{ }
-
 void SystemScheduler::add_system(System &s)
 {
        nodes.emplace_back(&s, reflector.find_class(typeid(s)));

diff --git a/source/game/systemscheduler.h b/source/game/systemscheduler.h
index 66764c80f263c426a80d2cfd9d3b5d0664743d07..4bb11d1fcfd7df1b7b6181134ed6c6064519f739 100644 (file)
--- a/source/game/systemscheduler.h
+++ b/source/game/systemscheduler.h
@@ -37,7 +37,7 @@ private:
        std::vector<Group> groups;
 
 public:
-       SystemScheduler(Reflection::Reflector &);
+       SystemScheduler(Reflection::Reflector &r): reflector(r) { }
 
        void add_system(System &);
        void remove_system(System &);

diff --git a/source/game/transform.cpp b/source/game/transform.cpp
index 60225f15f4f979acc73e11c5ef39c4e3031dc13e..09345449a28eca7dcd135bbf7ad0ec527ff6ea62 100644 (file)
--- a/source/game/transform.cpp
+++ b/source/game/transform.cpp
@@ -18,10 +18,6 @@ TransformValues TransformValues::from_matrix(const LinAl::Matrix<float, 4, 4> &m
        return { p, r, s };
 }
 
-Transform::Transform(Handle<Entity> e):
-       BufferedComponent<TransformData>(e)
-{ }
-
 void Transform::set_values(const TransformValues &v)
 {
        write().values = v;

diff --git a/source/game/transform.h b/source/game/transform.h
index 78e42d4a19fc18708d0ca5ca96a7f68352ca4ed1..249e73227be4268df161782b7647212e311f76f2 100644 (file)
--- a/source/game/transform.h
+++ b/source/game/transform.h
@@ -35,7 +35,7 @@ struct TransformData
 class MSPGAME_API Transform: public BufferedComponent<TransformData>
 {
 public:
-       Transform(Handle<Entity>);
+       Transform(Handle<Entity> e): BufferedComponent(e) { }
 
        void set_values(const TransformValues &);
        void set_position(const LinAl::Vector<float, 3> &);

diff --git a/source/gameview/renderer.cpp b/source/gameview/renderer.cpp
index 636835a2d8c5d2dba75003136fe33bbd8096adba..8173d1dcf781232429162f0677869f0373786639 100644 (file)
--- a/source/gameview/renderer.cpp
+++ b/source/gameview/renderer.cpp
@@ -307,6 +307,7 @@ void Renderer::tick(Time::TimeDelta)
 }
 
 
+// Hide the Owned destructors from the header
 Renderer::RenderedEntity::RenderedEntity(Game::Handle<Game::Entity> e):
        entity(e)
 { }

diff --git a/source/gameview/trackedelement.cpp b/source/gameview/trackedelement.cpp
deleted file mode 100644 (file)
index 2b94c23..0000000
--- a/source/gameview/trackedelement.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "trackedelement.h"
-
-namespace Msp::GameView {
-
-TrackedElement::TrackedElement(Game::Handle<Game::Entity> p, Role r):
-       Component(p),
-       role(r)
-{ }
-
-} // namespace Msp::GameView

diff --git a/source/gameview/trackedelement.h b/source/gameview/trackedelement.h
index 6158d925e38f837e6fdb680317a7e7bd118a50d1..3144c78b60e207316001c6d51a8eb7c3531221d8 100644 (file)
--- a/source/gameview/trackedelement.h
+++ b/source/gameview/trackedelement.h
@@ -20,7 +20,7 @@ private:
        Role role;
 
 public:
-       TrackedElement(Game::Handle<Game::Entity>, Role);
+       TrackedElement(Game::Handle<Game::Entity> e, Role r): Component(e), role(r) { }
 
        Role get_role() const { return role; }
 };