mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Disable sun rendering on the reflection camera

Browse Source 
Not needed, we have specular highlights.
This commit is contained in:
scrawl 2015-10-29 01:17:23 +01:00
parent f336c6db87
commit 7692ae175a
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/openmw/mwrender/sky.cpp
View File

@ -411,6 +411,7 @@ public:
, mUpdater(new Updater) , mUpdater(new Updater)
{ {
mTransform->addUpdateCallback(mUpdater); mTransform->addUpdateCallback(mUpdater);
mTransform->setNodeMask(Mask_Sun);
osg::ref_ptr<osg::Texture2D> sunTex = textureManager.getTexture2D("textures/tx_sun_05.dds", osg::ref_ptr<osg::Texture2D> sunTex = textureManager.getTexture2D("textures/tx_sun_05.dds",
osg::Texture::CLAMP, osg::Texture::CLAMP,

17
apps/openmw/mwrender/vismask.hpp
View File

@ -15,20 +15,21 @@ namespace MWRender
Mask_Actor = (1<<3), Mask_Actor = (1<<3),
Mask_Player = (1<<4), Mask_Player = (1<<4),
Mask_Sky = (1<<5), Mask_Sky = (1<<5),
Mask_Water = (1<<6), Mask_Sun = (1<<6),
Mask_SimpleWater = (1<<7), Mask_Water = (1<<7),
Mask_Terrain = (1<<8), Mask_SimpleWater = (1<<8),
Mask_FirstPerson = (1<<9), Mask_Terrain = (1<<9),
Mask_FirstPerson = (1<<10),
// top level masks // top level masks
Mask_Scene = (1<<10), Mask_Scene = (1<<11),
Mask_GUI = (1<<11), Mask_GUI = (1<<12),
// Set on a Geode // Set on a Geode
Mask_ParticleSystem = (1<<12), Mask_ParticleSystem = (1<<13),
// Set on cameras within the main scene graph // Set on cameras within the main scene graph
Mask_RenderToTexture = (1<<13) Mask_RenderToTexture = (1<<14)
// reserved: (1<<16) for SceneUtil::Mask_Lit // reserved: (1<<16) for SceneUtil::Mask_Lit
}; };

2
apps/openmw/mwrender/water.cpp
View File

@ -259,7 +259,7 @@ public:
setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT); setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
setReferenceFrame(osg::Camera::RELATIVE_RF); setReferenceFrame(osg::Camera::RELATIVE_RF);
setCullMask(Mask_Effect|Mask_Scene|Mask_Terrain|Mask_Actor|Mask_ParticleSystem|Mask_Sky|Mask_Player|(1<<16)); setCullMask(Mask_Effect|Mask_Scene|Mask_Terrain|Mask_Actor|Mask_ParticleSystem|Mask_Sky|Mask_Sun|Mask_Player|(1<<16));
setNodeMask(Mask_RenderToTexture); setNodeMask(Mask_RenderToTexture);
setViewport(0, 0, rttSize, rttSize); setViewport(0, 0, rttSize, rttSize);