Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Remove unnecessary user render target code from bloom, see #43

Browse source 
--HG--
branch : multipass-stereo
This commit is contained in:
kaetemi 2013-07-03 03:21:57 +02:00
parent 8c86b05d5b
commit 52f4a37939
2 changed files with 6 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/nel/include/nel/3d/bloom_effect.h
View file

@ -83,7 +83,6 @@ public:
// If window size exceeds 256*256 the textures used to apply blur are reinitialized with // If window size exceeds 256*256 the textures used to apply blur are reinitialized with
// 256*256 size. If a dimension is less than 256, the texture is initialized with the nearer // 256*256 size. If a dimension is less than 256, the texture is initialized with the nearer
// power of 2, lower than this window dimension. // power of 2, lower than this window dimension.
void initBloom(UTexture *renderTarget);
void initBloom(); void initBloom();
// Called at the end of renderAll method in the main loop, recover stretched texture, apply // Called at the end of renderAll method in the main loop, recover stretched texture, apply
@ -132,15 +131,13 @@ private:
uint8 _DensityBloom; uint8 _DensityBloom;
// render target textures // render target textures
// used to display scene (FIXME: redundant when user render target provided...) // used to display scene
NLMISC::CSmartPtr<NL3D::ITexture> _InitText; NLMISC::CSmartPtr<NL3D::ITexture> _InitText;
// used as stretched texture from _InitText, as displayed texture in first blur pass, // used as stretched texture from _InitText, as displayed texture in first blur pass,
// and as render target in second blur pass. // and as render target in second blur pass.
NLMISC::CSmartPtr<NL3D::ITexture> _BlurFinalTex; NLMISC::CSmartPtr<NL3D::ITexture> _BlurFinalTex;
// used as render target in first blur pass, and as displayed texture on second blur pass. // used as render target in first blur pass, and as displayed texture on second blur pass.
NLMISC::CSmartPtr<NL3D::ITexture> _BlurHorizontalTex; NLMISC::CSmartPtr<NL3D::ITexture> _BlurHorizontalTex;
/// User provided render target.
NLMISC::CSmartPtr<NL3D::ITexture> m_UserRenderTarget;
// materials // materials

38
code/nel/src/3d/bloom_effect.cpp
View file

@ -271,18 +271,11 @@ void CBloomEffect::initTexture(CSmartPtr<ITexture> & tex, bool isMode2D, uint32
//----------------------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------------------
void CBloomEffect::initBloom() void CBloomEffect::initBloom() // clientcfg
{
initBloom(NULL);
}
void CBloomEffect::initBloom(UTexture *renderTarget) // clientcfg
{ {
if(!((CDriverUser *)_Driver)->getDriver()->supportBloomEffect()) if(!((CDriverUser *)_Driver)->getDriver()->supportBloomEffect())
return; return;
m_UserRenderTarget = renderTarget ? dynamic_cast<CTextureUser *>(renderTarget)->getITexture() : NULL;
// don't activate bloom when PolygonMode is different from Filled // don't activate bloom when PolygonMode is different from Filled
if (_Driver->getPolygonMode() != UDriver::Filled) return; if (_Driver->getPolygonMode() != UDriver::Filled) return;
@ -355,20 +348,8 @@ void CBloomEffect::initBloom(UTexture *renderTarget) // clientcfg
_DisplaySquareBlurMat.getObjectPtr()->setTexture(1, _BlurFinalTex); _DisplaySquareBlurMat.getObjectPtr()->setTexture(1, _BlurFinalTex);
} }
} }
// For now the user target must be the window size
// to be compatible with the existing code.
// TODO: Instead, if user render target is provided,
// assume the size of the user render target as
// the screen size to be used.
if (m_UserRenderTarget.getPtr())
{
nlassert(_WndWidth == m_UserRenderTarget->getWidth());
nlassert(_WndHeight == m_UserRenderTarget->getHeight());
_DisplayInitMat.getObjectPtr()->setTexture(0, m_UserRenderTarget);
}
NL3D::CTextureUser txt = (_InitBloomEffect) ? (CTextureUser(m_UserRenderTarget.getPtr() ? m_UserRenderTarget : _InitText)) : (CTextureUser()); NL3D::CTextureUser txt = (_InitBloomEffect) ? (CTextureUser(_InitText)) : (CTextureUser());
if(!((CDriverUser *) _Driver)->setRenderTarget(txt, 0, 0, _WndWidth, _WndHeight)) if(!((CDriverUser *) _Driver)->setRenderTarget(txt, 0, 0, _WndWidth, _WndHeight))
{ {
nlwarning("setRenderTarget return false with initial texture for bloom effect\n"); nlwarning("setRenderTarget return false with initial texture for bloom effect\n");
@ -389,7 +370,7 @@ void CBloomEffect::endBloom() // clientcfg
if(_Driver->getWindowWidth()==0 || _Driver->getWindowHeight()==0) if(_Driver->getWindowWidth()==0 || _Driver->getWindowHeight()==0)
return; return;
CTextureUser txt1 = (_InitBloomEffect) ? (CTextureUser(m_UserRenderTarget.getPtr() ? m_UserRenderTarget : _InitText)) : (CTextureUser()); CTextureUser txt1 = (_InitBloomEffect) ? (CTextureUser(_InitText)) : (CTextureUser());
CTextureUser txt2(_BlurFinalTex); CTextureUser txt2(_BlurFinalTex);
CRect rect1(0, 0, _WndWidth, _WndHeight); CRect rect1(0, 0, _WndWidth, _WndHeight);
CRect rect2(0, 0, _BlurWidth, _BlurHeight); CRect rect2(0, 0, _BlurWidth, _BlurHeight);
@ -416,7 +397,7 @@ void CBloomEffect::applyBlur()
// in opengl, display in init texture // in opengl, display in init texture
if(_InitBloomEffect) if(_InitBloomEffect)
{ {
CTextureUser txt(m_UserRenderTarget.getPtr() ? m_UserRenderTarget : _InitText); CTextureUser txt(_InitText);
if(!((CDriverUser *) _Driver)->setRenderTarget(txt, 0, 0, _WndWidth, _WndHeight)) if(!((CDriverUser *) _Driver)->setRenderTarget(txt, 0, 0, _WndWidth, _WndHeight))
{ {
nlwarning("setRenderTarget return false with initial texture for bloom effect\n"); nlwarning("setRenderTarget return false with initial texture for bloom effect\n");
@ -478,7 +459,7 @@ void CBloomEffect::endInterfacesDisplayBloom() // clientcfg
{ {
// Render from render target to screen if necessary. // Render from render target to screen if necessary.
// Don't do this when the blend was done to the screen or when rendering to a user provided rendertarget. // Don't do this when the blend was done to the screen or when rendering to a user provided rendertarget.
if (_InitBloomEffect && m_UserRenderTarget.isNull()) if (_InitBloomEffect)
{ {
if(!_Driver->supportBloomEffect() || !_Init) if(!_Driver->supportBloomEffect() || !_Init)
return; return;
@ -511,15 +492,6 @@ void CBloomEffect::endInterfacesDisplayBloom() // clientcfg
_Driver->drawQuad(_DisplayQuad, _DisplayInitMat); _Driver->drawQuad(_DisplayQuad, _DisplayInitMat);
_Driver->setMatrixMode3D(pCam); _Driver->setMatrixMode3D(pCam);
} }
if (m_UserRenderTarget.getPtr())
{
if (_InitBloomEffect)
{
_DisplayInitMat.getObjectPtr()->setTexture(0, _InitText);
}
m_UserRenderTarget = NULL;
}
} }