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

Added default material to sprites 

Former-commit-id: 8a68d3d9b251ff93a793d4e001aed721558a8eef
This commit is contained in:
Lynix 2015-01-17 00:34:09 +01:00
parent 71c1d5f527
commit 3ed18e70da
2 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ class NAZARA_API NzSprite : public NzSceneNode
bool IsDrawable() const; bool IsDrawable() const;
void SetColor(const NzColor& color); void SetColor(const NzColor& color);
void SetDefaultMaterial();
void SetMaterial(NzMaterial* material, bool resizeSprite = true); void SetMaterial(NzMaterial* material, bool resizeSprite = true);
void SetSize(const NzVector2f& size); void SetSize(const NzVector2f& size);
void SetSize(float sizeX, float sizeY); void SetSize(float sizeX, float sizeY);

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

@ -4,6 +4,7 @@
#include <Nazara/Graphics/Sprite.hpp> #include <Nazara/Graphics/Sprite.hpp>
#include <Nazara/Graphics/AbstractViewer.hpp> #include <Nazara/Graphics/AbstractViewer.hpp>
#include <cstring>
#include <memory> #include <memory>
#include <Nazara/Graphics/Debug.hpp> #include <Nazara/Graphics/Debug.hpp>
@ -15,32 +16,18 @@ m_size(64.f, 64.f),
m_boundingVolumeUpdated(true), m_boundingVolumeUpdated(true),
m_verticesUpdated(false) m_verticesUpdated(false)
{ {
SetDefaultMaterial();
} }
NzSprite::NzSprite(NzTexture* texture) : NzSprite::NzSprite(NzTexture* texture) :
m_boundingVolume(NzBoundingVolumef::Null()), m_boundingVolume(NzBoundingVolumef::Null()),
m_color(NzColor::White), m_color(NzColor::White),
m_textureCoords(0.f, 0.f, 1.f, 1.f), m_textureCoords(0.f, 0.f, 1.f, 1.f),
m_size(64.f, 64.f),
m_boundingVolumeUpdated(false),
m_verticesUpdated(false) m_verticesUpdated(false)
{ {
if (texture) SetTexture(texture, true);
{
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) :
@ -108,13 +95,27 @@ void NzSprite::SetColor(const NzColor& color)
m_verticesUpdated = false; m_verticesUpdated = false;
} }
void NzSprite::SetDefaultMaterial()
{
std::unique_ptr<NzMaterial> material(new NzMaterial);
material->Enable(nzRendererParameter_FaceCulling, false);
material->EnableLighting(false);
SetMaterial(material.get());
material->SetPersistent(false);
material.release();
}
void NzSprite::SetMaterial(NzMaterial* material, bool resizeSprite) void NzSprite::SetMaterial(NzMaterial* material, bool resizeSprite)
{ {
m_material = material; m_material = material;
if (m_material && resizeSprite)
{
NzTexture* diffuseMap = m_material->GetDiffuseMap(); NzTexture* diffuseMap = m_material->GetDiffuseMap();
if (resizeSprite && diffuseMap && diffuseMap->IsValid()) if (diffuseMap && diffuseMap->IsValid())
SetSize(NzVector2f(NzVector2ui(diffuseMap->GetSize()))); SetSize(NzVector2f(NzVector2ui(diffuseMap->GetSize())));
}
} }
void NzSprite::SetSize(const NzVector2f& size) void NzSprite::SetSize(const NzVector2f& size)
@ -134,15 +135,17 @@ void NzSprite::SetSize(float sizeX, float sizeY)
void NzSprite::SetTexture(NzTexture* texture, bool resizeSprite) void NzSprite::SetTexture(NzTexture* texture, bool resizeSprite)
{ {
std::unique_ptr<NzMaterial> material(new NzMaterial); if (!m_material)
material->SetPersistent(false); SetDefaultMaterial();
else if (m_material->GetResourceReferenceCount() > 1)
{
m_material = new NzMaterial(*m_material);
m_material->SetPersistent(false);
}
material->Enable(nzRendererParameter_FaceCulling, false); m_material->SetDiffuseMap(texture);
material->EnableLighting(false); if (resizeSprite && texture && texture->IsValid())
material->SetDiffuseMap(texture); SetSize(NzVector2f(NzVector2ui(texture->GetSize())));
SetMaterial(material.get(), resizeSprite);
material.release();
} }
void NzSprite::SetTextureCoords(const NzRectf& coords) void NzSprite::SetTextureCoords(const NzRectf& coords)