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

Added Sprite::SetTexture 

Former-commit-id: 275e689110fe7b86159b895a3016a64f1103effb
This commit is contained in:
Lynix 2013-10-09 10:13:46 +02:00
parent 0f382fd1ad
commit 3cbcc527cd
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ class NAZARA_API NzSprite : public NzSceneNode
{ {
public: public:
NzSprite(); NzSprite();
NzSprite(NzTexture* texture);
NzSprite(const NzSprite& sprite); NzSprite(const NzSprite& sprite);
NzSprite(NzSprite&& sprite); NzSprite(NzSprite&& sprite);
~NzSprite(); ~NzSprite();
@ -29,8 +30,9 @@ class NAZARA_API NzSprite : public NzSceneNode
bool IsDrawable() const; bool IsDrawable() const;
void SetMaterial(NzMaterial* material); void SetMaterial(NzMaterial* material, bool resizeSprite = true);
void SetSize(const NzVector2f& size); void SetSize(const NzVector2f& size);
void SetTexture(NzTexture* texture, bool resizeSprite = true);
void SetTextureCoords(const NzRectf& coords); void SetTextureCoords(const NzRectf& coords);
void SetTextureRect(const NzRectui& rect); void SetTextureRect(const NzRectui& rect);

44
src/Nazara/Graphics/Sprite.cpp
View File

@ -3,6 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Graphics/Sprite.hpp> #include <Nazara/Graphics/Sprite.hpp>
#include <memory>
#include <Nazara/Graphics/Debug.hpp> #include <Nazara/Graphics/Debug.hpp>
NzSprite::NzSprite() : NzSprite::NzSprite() :
@ -13,6 +14,30 @@ m_boundingVolumeUpdated(true)
{ {
} }
NzSprite::NzSprite(NzTexture* texture) :
m_boundingVolume(NzBoundingVolumef::Null()),
m_textureCoords(0.f, 0.f, 1.f, 1.f)
{
if (texture)
{
m_material = new NzMaterial;
m_material->SetPersistent(false);
m_material->SetDiffuseMap(texture);
if (texture->IsValid())
m_size.Set(texture->GetWidth(), texture->GetHeight());
else
m_size.Set(64.f, 64.f);
m_boundingVolumeUpdated = false;
}
else
{
m_size.Set(64.f, 64.f);
m_boundingVolumeUpdated = true;
}
}
NzSprite::NzSprite(const NzSprite& sprite) : NzSprite::NzSprite(const NzSprite& sprite) :
NzSceneNode(sprite), NzSceneNode(sprite),
m_boundingVolume(sprite.m_boundingVolume), m_boundingVolume(sprite.m_boundingVolume),
@ -71,15 +96,32 @@ bool NzSprite::IsDrawable() const
return m_material != nullptr; return m_material != nullptr;
} }
void NzSprite::SetMaterial(NzMaterial* material) void NzSprite::SetMaterial(NzMaterial* material, bool resizeSprite)
{ {
m_material = material; m_material = material;
NzTexture* diffuseMap = m_material->GetDiffuseMap();
if (resizeSprite && diffuseMap && diffuseMap->IsValid())
SetSize(NzVector2f(diffuseMap->GetSize()));
} }
void NzSprite::SetSize(const NzVector2f& size) void NzSprite::SetSize(const NzVector2f& size)
{ {
m_size = size; m_size = size;
m_boundingVolume.MakeNull(); m_boundingVolume.MakeNull();
m_boundingVolumeUpdated = false;
}
void NzSprite::SetTexture(NzTexture* texture, bool resizeSprite)
{
std::unique_ptr<NzMaterial> material(new NzMaterial);
material->Enable(nzRendererParameter_DepthBuffer, false);
material->EnableLighting(false);
material->SetDiffuseMap(texture);
material->SetPersistent(false);
SetMaterial(material.get(), resizeSprite);
material.release();
} }
void NzSprite::SetTextureCoords(const NzRectf& coords) void NzSprite::SetTextureCoords(const NzRectf& coords)