diff options
Diffstat (limited to 'yage/entity')
-rw-r--r-- | yage/entity/engine.cpp | 1 | ||||
-rw-r--r-- | yage/entity/engine.h | 4 | ||||
-rw-r--r-- | yage/entity/entity.cpp | 1 | ||||
-rw-r--r-- | yage/entity/entity.h | 12 | ||||
-rw-r--r-- | yage/entity/space.cpp | 1 | ||||
-rw-r--r-- | yage/entity/space.h | 4 | ||||
-rw-r--r-- | yage/entity/system.h | 3 |
7 files changed, 17 insertions, 9 deletions
diff --git a/yage/entity/engine.cpp b/yage/entity/engine.cpp index f3a056db..1cef4504 100644 --- a/yage/entity/engine.cpp +++ b/yage/entity/engine.cpp @@ -1,4 +1,5 @@ /** --------------------------------------------------------------------------- + * -*- c++ -*- * @file: engine.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> diff --git a/yage/entity/engine.h b/yage/entity/engine.h index bac32fe0..9a1f6d2b 100644 --- a/yage/entity/engine.h +++ b/yage/entity/engine.h @@ -1,4 +1,5 @@ /** --------------------------------------------------------------------------- + * -*- c++ -*- * @file: engine.h * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> @@ -28,7 +29,6 @@ class Space; class Engine : public NonCopyable { public: - ~Engine(); /// Initialize window and other aspects of the engine. @@ -45,7 +45,7 @@ public: /// Returns the instance of the engine, as there is only one instance of the /// engine. - static Engine& instance(); + static Engine &instance(); private: /// Window diff --git a/yage/entity/entity.cpp b/yage/entity/entity.cpp index c7e8fd50..1a2b16ad 100644 --- a/yage/entity/entity.cpp +++ b/yage/entity/entity.cpp @@ -1,4 +1,5 @@ /** --------------------------------------------------------------------------- + * -*- c++ -*- * @file: entity.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> diff --git a/yage/entity/entity.h b/yage/entity/entity.h index 2f086bea..a032ad8a 100644 --- a/yage/entity/entity.h +++ b/yage/entity/entity.h @@ -1,4 +1,5 @@ /** --------------------------------------------------------------------------- + * -*- c++ -*- * @file: entity.h * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> @@ -8,8 +9,8 @@ #pragma once -#include <vector> #include <memory> +#include <vector> namespace yage { @@ -77,7 +78,8 @@ private: * Should not be inherited from when declaring a new component. Instead, the * Component<Derived> should be used. */ -class BaseComponent { +class BaseComponent +{ public: /** Group used to register a specific component internally with the entity * manager. @@ -94,7 +96,8 @@ protected: * data itself. */ template <typename Derived> -class Component : public BaseComponent { +class Component : public BaseComponent +{ private: friend class EntityManager; @@ -104,7 +107,8 @@ private: /** Contains a list of all components that belong to a sepecific group, these * are then stored in the main entity manager. */ -class ComponentGroup { +class ComponentGroup +{ private: friend class EntityManager; diff --git a/yage/entity/space.cpp b/yage/entity/space.cpp index 24afda72..530f5b49 100644 --- a/yage/entity/space.cpp +++ b/yage/entity/space.cpp @@ -1,4 +1,5 @@ /** --------------------------------------------------------------------------- + * -*- c++ -*- * @file: space.cpp * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> diff --git a/yage/entity/space.h b/yage/entity/space.h index ed867534..0763b189 100644 --- a/yage/entity/space.h +++ b/yage/entity/space.h @@ -1,4 +1,5 @@ /** --------------------------------------------------------------------------- + * -*- c++ -*- * @file: space.h * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> @@ -8,14 +9,13 @@ #pragma once -#include <vector> #include <memory> +#include <vector> #include "entity.h" #include "system.h" struct Movement { - }; namespace yage diff --git a/yage/entity/system.h b/yage/entity/system.h index 7c67ac6f..84536cc9 100644 --- a/yage/entity/system.h +++ b/yage/entity/system.h @@ -1,4 +1,5 @@ /** --------------------------------------------------------------------------- + * -*- c++ -*- * @file: system.h * * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> @@ -18,7 +19,7 @@ namespace yage class System : public NonCopyable { public: - virtual void init() = 0; + virtual void init() = 0; virtual void update() = 0; }; |