diff --git a/headers/enduro2d/high/components/_components.hpp b/headers/enduro2d/high/components/_components.hpp new file mode 100644 index 00000000..ff2f206a --- /dev/null +++ b/headers/enduro2d/high/components/_components.hpp @@ -0,0 +1,17 @@ +/******************************************************************************* + * This file is part of the "Enduro2D" + * For conditions of distribution and use, see copyright notice in LICENSE.md + * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com) + ******************************************************************************/ + +#pragma once + +#include "../_high.hpp" + +#include "../factory.hpp" +#include "../gobject.hpp" +#include "../inspector.hpp" + +namespace e2d::components +{ +} diff --git a/headers/enduro2d/high/components/actor.hpp b/headers/enduro2d/high/components/actor.hpp index 0e889f6a..bc984a55 100644 --- a/headers/enduro2d/high/components/actor.hpp +++ b/headers/enduro2d/high/components/actor.hpp @@ -6,11 +6,7 @@ #pragma once -#include "../_high.hpp" - -#include "../factory.hpp" -#include "../gobject.hpp" -#include "../inspector.hpp" +#include "_components.hpp" #include "../node.hpp" diff --git a/headers/enduro2d/high/components/behaviour.hpp b/headers/enduro2d/high/components/behaviour.hpp index 2fd47578..892016f3 100644 --- a/headers/enduro2d/high/components/behaviour.hpp +++ b/headers/enduro2d/high/components/behaviour.hpp @@ -6,11 +6,7 @@ #pragma once -#include "../_high.hpp" - -#include "../factory.hpp" -#include "../gobject.hpp" -#include "../inspector.hpp" +#include "_components.hpp" #include "../assets/script_asset.hpp" diff --git a/headers/enduro2d/high/components/camera.hpp b/headers/enduro2d/high/components/camera.hpp index c276e8d0..c9d6d25a 100644 --- a/headers/enduro2d/high/components/camera.hpp +++ b/headers/enduro2d/high/components/camera.hpp @@ -6,11 +6,7 @@ #pragma once -#include "../_high.hpp" - -#include "../factory.hpp" -#include "../gobject.hpp" -#include "../inspector.hpp" +#include "_components.hpp" namespace e2d { diff --git a/headers/enduro2d/high/components/colliders.hpp b/headers/enduro2d/high/components/colliders.hpp index 38ab7263..dffe1829 100644 --- a/headers/enduro2d/high/components/colliders.hpp +++ b/headers/enduro2d/high/components/colliders.hpp @@ -6,11 +6,7 @@ #pragma once -#include "../_high.hpp" - -#include "../factory.hpp" -#include "../gobject.hpp" -#include "../inspector.hpp" +#include "_components.hpp" namespace e2d::impl { diff --git a/headers/enduro2d/high/components/commands.hpp b/headers/enduro2d/high/components/commands.hpp index d0394d18..a2dd3905 100644 --- a/headers/enduro2d/high/components/commands.hpp +++ b/headers/enduro2d/high/components/commands.hpp @@ -6,7 +6,7 @@ #pragma once -#include "../_high.hpp" +#include "_components.hpp" namespace e2d { diff --git a/headers/enduro2d/high/components/disabled.hpp b/headers/enduro2d/high/components/disabled.hpp index a16dda93..be2eff0d 100644 --- a/headers/enduro2d/high/components/disabled.hpp +++ b/headers/enduro2d/high/components/disabled.hpp @@ -6,7 +6,7 @@ #pragma once -#include "../_high.hpp" +#include "_components.hpp" namespace e2d { diff --git a/headers/enduro2d/high/components/events.hpp b/headers/enduro2d/high/components/events.hpp index 32d8aff2..544e5141 100644 --- a/headers/enduro2d/high/components/events.hpp +++ b/headers/enduro2d/high/components/events.hpp @@ -6,7 +6,7 @@ #pragma once -#include "../_high.hpp" +#include "_components.hpp" namespace e2d { diff --git a/headers/enduro2d/high/components/flipbook_player.hpp b/headers/enduro2d/high/components/flipbook_player.hpp index 913fee59..d3d497c9 100644 --- a/headers/enduro2d/high/components/flipbook_player.hpp +++ b/headers/enduro2d/high/components/flipbook_player.hpp @@ -6,11 +6,7 @@ #pragma once -#include "../_high.hpp" - -#include "../factory.hpp" -#include "../gobject.hpp" -#include "../inspector.hpp" +#include "_components.hpp" #include "../assets/flipbook_asset.hpp" diff --git a/headers/enduro2d/high/components/label.hpp b/headers/enduro2d/high/components/label.hpp index 3afcb8dc..a6766f6e 100644 --- a/headers/enduro2d/high/components/label.hpp +++ b/headers/enduro2d/high/components/label.hpp @@ -6,11 +6,7 @@ #pragma once -#include "../_high.hpp" - -#include "../factory.hpp" -#include "../gobject.hpp" -#include "../inspector.hpp" +#include "_components.hpp" #include "../assets/font_asset.hpp" diff --git a/headers/enduro2d/high/components/model_renderer.hpp b/headers/enduro2d/high/components/model_renderer.hpp index a4584d53..7f1cb61d 100644 --- a/headers/enduro2d/high/components/model_renderer.hpp +++ b/headers/enduro2d/high/components/model_renderer.hpp @@ -6,11 +6,7 @@ #pragma once -#include "../_high.hpp" - -#include "../factory.hpp" -#include "../gobject.hpp" -#include "../inspector.hpp" +#include "_components.hpp" #include "../assets/model_asset.hpp" diff --git a/headers/enduro2d/high/components/named.hpp b/headers/enduro2d/high/components/named.hpp index d0695898..2c3d74b6 100644 --- a/headers/enduro2d/high/components/named.hpp +++ b/headers/enduro2d/high/components/named.hpp @@ -6,11 +6,7 @@ #pragma once -#include "../_high.hpp" - -#include "../factory.hpp" -#include "../gobject.hpp" -#include "../inspector.hpp" +#include "_components.hpp" namespace e2d { @@ -50,7 +46,7 @@ namespace e2d class component_inspector final : component_inspector<> { public: static const char* title; - + void operator()(gcomponent& c) const; }; } diff --git a/headers/enduro2d/high/components/renderer.hpp b/headers/enduro2d/high/components/renderer.hpp index c074c086..b67bd6da 100644 --- a/headers/enduro2d/high/components/renderer.hpp +++ b/headers/enduro2d/high/components/renderer.hpp @@ -6,11 +6,7 @@ #pragma once -#include "../_high.hpp" - -#include "../factory.hpp" -#include "../gobject.hpp" -#include "../inspector.hpp" +#include "_components.hpp" #include "../assets/material_asset.hpp" diff --git a/headers/enduro2d/high/components/rigid_body.hpp b/headers/enduro2d/high/components/rigid_body.hpp index 8ca65b39..5cb89a6a 100644 --- a/headers/enduro2d/high/components/rigid_body.hpp +++ b/headers/enduro2d/high/components/rigid_body.hpp @@ -6,11 +6,7 @@ #pragma once -#include "../_high.hpp" - -#include "../factory.hpp" -#include "../gobject.hpp" -#include "../inspector.hpp" +#include "_components.hpp" namespace e2d { diff --git a/headers/enduro2d/high/components/scene.hpp b/headers/enduro2d/high/components/scene.hpp index 5867b150..4c8b03ca 100644 --- a/headers/enduro2d/high/components/scene.hpp +++ b/headers/enduro2d/high/components/scene.hpp @@ -6,11 +6,7 @@ #pragma once -#include "../_high.hpp" - -#include "../factory.hpp" -#include "../gobject.hpp" -#include "../inspector.hpp" +#include "_components.hpp" namespace e2d { diff --git a/headers/enduro2d/high/components/spine_player.hpp b/headers/enduro2d/high/components/spine_player.hpp index e29b50ac..3301a376 100644 --- a/headers/enduro2d/high/components/spine_player.hpp +++ b/headers/enduro2d/high/components/spine_player.hpp @@ -6,11 +6,7 @@ #pragma once -#include "../_high.hpp" - -#include "../factory.hpp" -#include "../gobject.hpp" -#include "../inspector.hpp" +#include "_components.hpp" #include "../assets/spine_asset.hpp" #include "../assets/material_asset.hpp" diff --git a/headers/enduro2d/high/components/sprite_renderer.hpp b/headers/enduro2d/high/components/sprite_renderer.hpp index dcd448b0..13a5e2eb 100644 --- a/headers/enduro2d/high/components/sprite_renderer.hpp +++ b/headers/enduro2d/high/components/sprite_renderer.hpp @@ -6,11 +6,7 @@ #pragma once -#include "../_high.hpp" - -#include "../factory.hpp" -#include "../gobject.hpp" -#include "../inspector.hpp" +#include "_components.hpp" #include "../assets/atlas_asset.hpp" #include "../assets/sprite_asset.hpp" diff --git a/headers/enduro2d/high/components/touchable.hpp b/headers/enduro2d/high/components/touchable.hpp index 6bf40ae7..78968dac 100644 --- a/headers/enduro2d/high/components/touchable.hpp +++ b/headers/enduro2d/high/components/touchable.hpp @@ -6,11 +6,7 @@ #pragma once -#include "../_high.hpp" - -#include "../factory.hpp" -#include "../gobject.hpp" -#include "../inspector.hpp" +#include "_components.hpp" namespace e2d {