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

Made Texture constructor consistent 

Former-commit-id: 92be798524a48cb979c09fa04558602bf3717391
This commit is contained in:
Lynix 2012-12-24 20:38:20 +01:00
parent 1a5cf8cc0f
commit dc3cfa40ec
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Renderer/Texture.hpp
View File

@ -22,7 +22,7 @@ class NAZARA_API NzTexture : public NzResource, NzNonCopyable
friend class NzShader; friend class NzShader;
public: public:
NzTexture(); NzTexture() = default;
explicit NzTexture(const NzImage& image); explicit NzTexture(const NzImage& image);
~NzTexture(); ~NzTexture();
@ -83,7 +83,7 @@ class NAZARA_API NzTexture : public NzResource, NzNonCopyable
NzRenderTexture* GetRenderTexture() const; NzRenderTexture* GetRenderTexture() const;
void SetRenderTexture(NzRenderTexture* renderTexture); void SetRenderTexture(NzRenderTexture* renderTexture);
NzTextureImpl* m_impl; NzTextureImpl* m_impl = nullptr;
}; };
#endif // NAZARA_TEXTURE_HPP #endif // NAZARA_TEXTURE_HPP

8
src/Nazara/Renderer/Texture.cpp
View File

@ -191,13 +191,7 @@ namespace
} }
} }
NzTexture::NzTexture() : NzTexture::NzTexture(const NzImage& image)
m_impl(nullptr)
{
}
NzTexture::NzTexture(const NzImage& image) :
m_impl(nullptr)
{ {
LoadFromImage(image); LoadFromImage(image);