From 1a6e55881b09db5a63647d29c5fe593c395866e7 Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 27 Jun 2013 12:53:04 +0200 Subject: [PATCH] Renamed Background to AbstractBackground Former-commit-id: c99ed2e48c4d82fb1100f412a85468c698142815 --- include/Nazara/Graphics.hpp | 2 +- .../{Background.hpp => AbstractBackground.hpp} | 12 ++++++------ include/Nazara/Graphics/ColorBackground.hpp | 4 ++-- include/Nazara/Graphics/Scene.hpp | 6 +++--- include/Nazara/Graphics/SkyboxBackground.hpp | 4 ++-- include/Nazara/Graphics/TextureBackground.hpp | 8 ++++++-- .../{Background.cpp => AbstractBackground.cpp} | 4 ++-- src/Nazara/Graphics/ForwardRenderTechnique.cpp | 4 ++-- src/Nazara/Graphics/Scene.cpp | 6 +++--- 9 files changed, 27 insertions(+), 23 deletions(-) rename include/Nazara/Graphics/{Background.hpp => AbstractBackground.hpp} (64%) rename src/Nazara/Graphics/{Background.cpp => AbstractBackground.cpp} (67%) diff --git a/include/Nazara/Graphics.hpp b/include/Nazara/Graphics.hpp index 6fdae72b3..41e78ba9e 100644 --- a/include/Nazara/Graphics.hpp +++ b/include/Nazara/Graphics.hpp @@ -29,9 +29,9 @@ #ifndef NAZARA_GLOBAL_GRAPHICS_HPP #define NAZARA_GLOBAL_GRAPHICS_HPP +#include #include #include -#include #include #include #include diff --git a/include/Nazara/Graphics/Background.hpp b/include/Nazara/Graphics/AbstractBackground.hpp similarity index 64% rename from include/Nazara/Graphics/Background.hpp rename to include/Nazara/Graphics/AbstractBackground.hpp index feb70aabe..0a6052848 100644 --- a/include/Nazara/Graphics/Background.hpp +++ b/include/Nazara/Graphics/AbstractBackground.hpp @@ -4,23 +4,23 @@ #pragma once -#ifndef NAZARA_BACKGROUND_HPP -#define NAZARA_BACKGROUND_HPP +#ifndef NAZARA_ABSTRACTBACKGROUND_HPP +#define NAZARA_ABSTRACTBACKGROUND_HPP #include #include class NzScene; -class NAZARA_API NzBackground +class NAZARA_API NzAbstractBackground { public: - NzBackground() = default; - virtual ~NzBackground(); + NzAbstractBackground() = default; + virtual ~NzAbstractBackground(); virtual void Draw(const NzScene* scene) const = 0; virtual nzBackgroundType GetBackgroundType() const = 0; }; -#endif // NAZARA_BACKGROUND_HPP +#endif // NAZARA_ABSTRACTBACKGROUND_HPP diff --git a/include/Nazara/Graphics/ColorBackground.hpp b/include/Nazara/Graphics/ColorBackground.hpp index 049157a08..5bfa55ab8 100644 --- a/include/Nazara/Graphics/ColorBackground.hpp +++ b/include/Nazara/Graphics/ColorBackground.hpp @@ -9,9 +9,9 @@ #include #include -#include +#include -class NAZARA_API NzColorBackground : public NzBackground +class NAZARA_API NzColorBackground : public NzAbstractBackground { public: NzColorBackground(const NzColor& color = NzColor::Black); diff --git a/include/Nazara/Graphics/Scene.hpp b/include/Nazara/Graphics/Scene.hpp index ab394d92e..c537c7906 100644 --- a/include/Nazara/Graphics/Scene.hpp +++ b/include/Nazara/Graphics/Scene.hpp @@ -10,8 +10,8 @@ #include #include #include +#include #include -#include #include class NzAbstractRenderQueue; @@ -38,7 +38,7 @@ class NAZARA_API NzScene NzCamera* GetActiveCamera() const; NzColor GetAmbientColor() const; - NzBackground* GetBackground() const; + NzAbstractBackground* GetBackground() const; NzAbstractRenderTechnique* GetRenderTechnique() const; NzSceneNode& GetRoot() const; float GetUpdateTime() const; @@ -47,7 +47,7 @@ class NAZARA_API NzScene void RegisterForUpdate(NzUpdatable* object); void SetAmbientColor(const NzColor& color); - void SetBackground(NzBackground* background); + void SetBackground(NzAbstractBackground* background); void SetRenderTechnique(NzAbstractRenderTechnique* renderTechnique); void SetUpdatePerSecond(unsigned int updatePerSecond); diff --git a/include/Nazara/Graphics/SkyboxBackground.hpp b/include/Nazara/Graphics/SkyboxBackground.hpp index a4069c7e5..5e02e58b4 100644 --- a/include/Nazara/Graphics/SkyboxBackground.hpp +++ b/include/Nazara/Graphics/SkyboxBackground.hpp @@ -8,14 +8,14 @@ #define NAZARA_SKYBOXBACKGROUND_HPP #include -#include +#include #include #include #include #include #include -class NAZARA_API NzSkyboxBackground : public NzBackground +class NAZARA_API NzSkyboxBackground : public NzAbstractBackground { public: NzSkyboxBackground(); diff --git a/include/Nazara/Graphics/TextureBackground.hpp b/include/Nazara/Graphics/TextureBackground.hpp index 58a458665..9ed003f36 100644 --- a/include/Nazara/Graphics/TextureBackground.hpp +++ b/include/Nazara/Graphics/TextureBackground.hpp @@ -8,13 +8,16 @@ #define NAZARA_TEXTUREBACKGROUND_HPP #include -#include +#include +#include #include -class NAZARA_API NzTextureBackground : public NzBackground +class NAZARA_API NzTextureBackground : public NzAbstractBackground { public: + NzTextureBackground(); NzTextureBackground(NzTexture* texture); + ~NzTextureBackground(); void Draw(const NzScene* scene) const; @@ -24,6 +27,7 @@ class NAZARA_API NzTextureBackground : public NzBackground void SetTexture(NzTexture* texture); private: + NzShaderRef m_shader; NzTextureRef m_texture; }; diff --git a/src/Nazara/Graphics/Background.cpp b/src/Nazara/Graphics/AbstractBackground.cpp similarity index 67% rename from src/Nazara/Graphics/Background.cpp rename to src/Nazara/Graphics/AbstractBackground.cpp index 2ae7e90e7..7b9c81299 100644 --- a/src/Nazara/Graphics/Background.cpp +++ b/src/Nazara/Graphics/AbstractBackground.cpp @@ -2,7 +2,7 @@ // This file is part of the "Nazara Engine - Graphics module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include -NzBackground::~NzBackground() = default; +NzAbstractBackground::~NzAbstractBackground() = default; diff --git a/src/Nazara/Graphics/ForwardRenderTechnique.cpp b/src/Nazara/Graphics/ForwardRenderTechnique.cpp index 21fc0350b..b388420b8 100644 --- a/src/Nazara/Graphics/ForwardRenderTechnique.cpp +++ b/src/Nazara/Graphics/ForwardRenderTechnique.cpp @@ -3,7 +3,7 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include -#include +#include #include #include #include @@ -38,7 +38,7 @@ void NzForwardRenderTechnique::Clear(const NzScene* scene) NzRenderer::Enable(nzRendererParameter_DepthWrite, true); NzRenderer::Clear(nzRendererClear_Depth); - NzBackground* background = scene->GetBackground(); + NzAbstractBackground* background = scene->GetBackground(); if (background) background->Draw(scene); } diff --git a/src/Nazara/Graphics/Scene.cpp b/src/Nazara/Graphics/Scene.cpp index 1d80efaca..191c865c1 100644 --- a/src/Nazara/Graphics/Scene.cpp +++ b/src/Nazara/Graphics/Scene.cpp @@ -23,8 +23,8 @@ struct NzSceneImpl { } + std::unique_ptr background; std::unique_ptr renderTechnique; - std::unique_ptr background; std::vector updateList; std::vector visibleUpdateList; NzClock updateClock; @@ -92,7 +92,7 @@ NzColor NzScene::GetAmbientColor() const return m_impl->ambientColor; } -NzBackground* NzScene::GetBackground() const +NzAbstractBackground* NzScene::GetBackground() const { return m_impl->background.get(); } @@ -135,7 +135,7 @@ void NzScene::SetAmbientColor(const NzColor& color) m_impl->ambientColor = color; } -void NzScene::SetBackground(NzBackground* background) +void NzScene::SetBackground(NzAbstractBackground* background) { m_impl->background.reset(background); }