From 68d6f62cd4cf1bfdd32188bc754e28bbfe5ef207 Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 26 May 2015 23:39:42 +0200 Subject: [PATCH] Graphics/AbstractRenderQueue: Made members public Former-commit-id: 61f69dda42b5d091a94d65b9f7f04ff1ce1ce59e --- include/Nazara/Graphics/AbstractRenderQueue.hpp | 7 +++---- src/Nazara/Graphics/AbstractRenderQueue.cpp | 12 ++++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/include/Nazara/Graphics/AbstractRenderQueue.hpp b/include/Nazara/Graphics/AbstractRenderQueue.hpp index d6a66ef38..6a8be559e 100644 --- a/include/Nazara/Graphics/AbstractRenderQueue.hpp +++ b/include/Nazara/Graphics/AbstractRenderQueue.hpp @@ -48,7 +48,6 @@ class NAZARA_API NzAbstractRenderQueue : NzNonCopyable virtual void Clear(bool fully); - protected: struct DirectionalLight { NzColor color; @@ -80,9 +79,9 @@ class NAZARA_API NzAbstractRenderQueue : NzNonCopyable float radius; }; - std::vector m_directionalLights; - std::vector m_pointLights; - std::vector m_spotLights; + std::vector directionalLights; + std::vector pointLights; + std::vector spotLights; }; #endif // NAZARA_ABSTRACTRENDERQUEUE_HPP diff --git a/src/Nazara/Graphics/AbstractRenderQueue.cpp b/src/Nazara/Graphics/AbstractRenderQueue.cpp index c3e2662f7..27681ae6c 100644 --- a/src/Nazara/Graphics/AbstractRenderQueue.cpp +++ b/src/Nazara/Graphics/AbstractRenderQueue.cpp @@ -9,22 +9,22 @@ NzAbstractRenderQueue::~NzAbstractRenderQueue() = default; void NzAbstractRenderQueue::AddDirectionalLight(const NzColor& color, float ambientFactor, float diffuseFactor, const NzVector3f& direction) { - m_directionalLights.push_back(DirectionalLight{color, direction, ambientFactor, diffuseFactor}); + directionalLights.push_back(DirectionalLight{color, direction, ambientFactor, diffuseFactor}); } void NzAbstractRenderQueue::AddPointLight(const NzColor& color, float ambientFactor, float diffuseFactor, const NzVector3f& position, float radius, float attenuation) { - m_pointLights.push_back(PointLight{color, position, ambientFactor, attenuation, diffuseFactor, radius}); + pointLights.push_back(PointLight{color, position, ambientFactor, attenuation, diffuseFactor, radius}); } void NzAbstractRenderQueue::AddSpotLight(const NzColor& color, float ambientFactor, float diffuseFactor, const NzVector3f& position, const NzVector3f& direction, float radius, float attenuation, float innerAngle, float outerAngle) { - m_spotLights.push_back(SpotLight{color, direction, position, ambientFactor, attenuation, diffuseFactor, innerAngle, outerAngle, radius}); + spotLights.push_back(SpotLight{color, direction, position, ambientFactor, attenuation, diffuseFactor, innerAngle, outerAngle, radius}); } void NzAbstractRenderQueue::Clear(bool fully) { - m_directionalLights.clear(); - m_pointLights.clear(); - m_spotLights.clear(); + directionalLights.clear(); + pointLights.clear(); + spotLights.clear(); }