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

Made SSAO load its noise texture from memory 

Former-commit-id: 69d5cd81c728e49be846c2be89d65ca2cd3e1e9b
This commit is contained in:
Lynix 2013-11-07 00:00:15 +01:00
parent 05f8b88b4d
commit a8a0bcf005
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Nazara/Graphics/DeferredRenderTechnique.cpp
View File

@ -664,9 +664,13 @@ m_texturesUpdated(false)
m_ssaoNoiseTexture->Create(nzImageType_2D, nzPixelFormat_RG8, 4, 4); m_ssaoNoiseTexture->Create(nzImageType_2D, nzPixelFormat_RG8, 4, 4);
m_ssaoNoiseTexture->Update(&noiseData[0]);*/ m_ssaoNoiseTexture->Update(&noiseData[0]);*/
const char noiseTexture[] = {
#include <Nazara/Graphics/Resources/DeferredShading/Textures/ssaoNoise.jpg.h>
};
m_ssaoNoiseTexture = new NzTexture; m_ssaoNoiseTexture = new NzTexture;
m_ssaoNoiseTexture->SetPersistent(false); m_ssaoNoiseTexture->SetPersistent(false);
m_ssaoNoiseTexture->LoadFromFile("resources/noise.jpg"); m_ssaoNoiseTexture->LoadFromMemory(noiseTexture, sizeof(noiseTexture));
m_ssaoProgram = BuildSSAOProgram(); m_ssaoProgram = BuildSSAOProgram();
m_ssaoProgram->SendInteger(m_ssaoProgram->GetUniformLocation("NoiseTextureSize"), m_ssaoNoiseTexture->GetWidth()); m_ssaoProgram->SendInteger(m_ssaoProgram->GetUniformLocation("NoiseTextureSize"), m_ssaoNoiseTexture->GetWidth());