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

Added a static New method to RefCounted-derived classes

Browse Source 
Former-commit-id: efd9e68e050fb6cc7e0df7a7c222ca759c502dc5
This commit is contained in:
Lynix
2015-01-25 23:41:09 +01:00
parent 5f5be93992
commit 0db92e671d
59 changed files with 532 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,14 +96,11 @@ void NzSprite::SetColor(const NzColor& color)
void NzSprite::SetDefaultMaterial()
{
std::unique_ptr<NzMaterial> material(new NzMaterial);
NzMaterialRef material = NzMaterial::New();
material->Enable(nzRendererParameter_FaceCulling, false);
material->EnableLighting(false);
SetMaterial(material.get());
material->SetPersistent(false);
material.release();
SetMaterial(material);
}
void NzSprite::SetMaterial(NzMaterial* material, bool resizeSprite)
@@ -137,10 +134,7 @@ void NzSprite::SetTexture(NzTexture* texture, bool resizeSprite)
if (!m_material)
SetDefaultMaterial();
else if (m_material->GetReferenceCount() > 1)
{
m_material = new NzMaterial(*m_material);
m_material->SetPersistent(false);
}
m_material = NzMaterial::New(*m_material); // Copie
m_material->SetDiffuseMap(texture);
if (resizeSprite && texture && texture->IsValid())