From 87733d62996071bec70f1a12b24bb8ab562f53d1 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Sat, 18 Feb 2023 11:27:20 -0800 Subject: [PATCH] Removed the troublesome components --- src/dawn/display/RenderPipeline.hpp | 1 + .../animation/TiledSpriteAnimation.hpp | 2 +- src/dawn/scene/components/Components.hpp | 21 ------------------- .../shader/SimpleTexturedShaderProgram.hpp | 1 - src/dawntictactoe/game/DawnGame.hpp | 1 - 5 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 src/dawn/scene/components/Components.hpp diff --git a/src/dawn/display/RenderPipeline.hpp b/src/dawn/display/RenderPipeline.hpp index db20a5f9..cb45a2cf 100644 --- a/src/dawn/display/RenderPipeline.hpp +++ b/src/dawn/display/RenderPipeline.hpp @@ -10,6 +10,7 @@ #include "scene/components/display/Material.hpp" #include "scene/components/display/MeshRenderer.hpp" #include "scene/components/display/Camera.hpp" +#include "scene/components/scene/SubSceneController.hpp" #include "ui/UIComponent.hpp" namespace Dawn { diff --git a/src/dawn/display/animation/TiledSpriteAnimation.hpp b/src/dawn/display/animation/TiledSpriteAnimation.hpp index db5dd507..928c4fa5 100644 --- a/src/dawn/display/animation/TiledSpriteAnimation.hpp +++ b/src/dawn/display/animation/TiledSpriteAnimation.hpp @@ -5,7 +5,7 @@ #pragma once #include "SimpleAnimation.hpp" -#include "scene/components/Components.hpp" +#include "scene/components/display/TiledSprite.hpp" namespace Dawn { struct TiledSpriteAnimation : public SimpleAnimation { diff --git a/src/dawn/scene/components/Components.hpp b/src/dawn/scene/components/Components.hpp deleted file mode 100644 index 80d9bade..00000000 --- a/src/dawn/scene/components/Components.hpp +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 2022 Dominic Masters -// -// This software is released under the MIT License. -// https://opensource.org/licenses/MIT - -#pragma once -#include "scene/components/display/AnimationController.hpp" -#include "scene/components/display/Camera.hpp" -#include "scene/components/display/Material.hpp" -#include "scene/components/display/MeshHost.hpp" -#include "scene/components/display/MeshRenderer.hpp" -#include "scene/components/display/PixelPerfectCamera.hpp" -#include "scene/components/display/SimpleRenderTargetQuad.hpp" -#include "scene/components/display/TiledSprite.hpp" - -#include "scene/components/example/ExampleSpin.hpp" - -#include "scene/components/scene/SubSceneController.hpp" -#include "scene/components/scene/SubSceneCameraAlign.hpp" - -#include "scene/components/ui/UICanvas.hpp" \ No newline at end of file diff --git a/src/dawnopengl/display/shader/SimpleTexturedShaderProgram.hpp b/src/dawnopengl/display/shader/SimpleTexturedShaderProgram.hpp index fafa4741..e6f99453 100644 --- a/src/dawnopengl/display/shader/SimpleTexturedShaderProgram.hpp +++ b/src/dawnopengl/display/shader/SimpleTexturedShaderProgram.hpp @@ -5,7 +5,6 @@ #pragma once #include "display/shader/Shader.hpp" -#include "scene/components/Components.hpp" namespace Dawn { class SimpleTexturedShaderProgram : public ShaderProgram { diff --git a/src/dawntictactoe/game/DawnGame.hpp b/src/dawntictactoe/game/DawnGame.hpp index 8839502f..e83df40f 100644 --- a/src/dawntictactoe/game/DawnGame.hpp +++ b/src/dawntictactoe/game/DawnGame.hpp @@ -5,7 +5,6 @@ #pragma once #include "game/_DawnGame.hpp" -#include "scene/components/Components.hpp" #include "save/DawnGameSaveManager.hpp" namespace Dawn {