sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Graphics/Renderable: Fix copy constructor/operator

Browse Source 
Former-commit-id: eb376d49285cefa1f0317719a47e41f62a11aae5
This commit is contained in:
Lynix
2015-05-26 14:13:24 +02:00
parent b075d05d82
commit be335c3e81
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Graphics/Renderable.hpp
View File

@@ -30,7 +30,7 @@ class NAZARA_API NzRenderable : public NzRefCounted
{
public:
NzRenderable() = default;
NzRenderable(const NzRenderable& renderable) = default;
NzRenderable(const NzRenderable& renderable);
virtual ~NzRenderable();
void EnsureBoundingVolumeUpdated() const;
@@ -40,7 +40,7 @@ class NAZARA_API NzRenderable : public NzRefCounted
virtual const NzBoundingVolumef& GetBoundingVolume() const;
virtual void UpdateBoundingVolume(NzBoundingVolumef* boundingVolume, const NzMatrix4f& transformMatrix) const;
NzRenderable& operator=(const NzRenderable& renderable) = default;
NzRenderable& operator=(const NzRenderable& renderable);
protected:
virtual void MakeBoundingVolume() const = 0;

12
include/Nazara/Graphics/Renderable.inl
View File

@@ -2,6 +2,12 @@
// This file is part of the "Nazara Engine - Graphics module"
// For conditions of distribution and use, see copyright notice in Config.hpp
NzRenderable::NzRenderable(const NzRenderable& renderable) :
m_boundingVolume(renderable.m_boundingVolume),
m_boundingVolumeUpdated(renderable.m_boundingVolumeUpdated)
{
}
void NzRenderable::EnsureBoundingVolumeUpdated() const
{
if (!m_boundingVolumeUpdated)
@@ -18,3 +24,9 @@ void NzRenderable::UpdateBoundingVolume() const
MakeBoundingVolume();
m_boundingVolumeUpdated = true;
}
NzRenderable& NzRenderable::operator=(const NzRenderable& renderable)
{
m_boundingVolume = renderable.m_boundingVolume;
m_boundingVolumeUpdated = renderable.m_boundingVolumeUpdated;
}