mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 17:11:33 +00:00
Code Issues Releases Wiki Activity

Formatting changes

Browse source
This commit is contained in:
Mads Buvik Sandvei 2025-01-26 17:05:42 +01:00
parent ea51c55d00
commit a1df9afc9a
3 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwrender/characterpreview.cpp
View file

@ -266,8 +266,7 @@ namespace MWRender
stateset->addUniform(new osg::Uniform("screenRes", osg::Vec2f{ 1, 1 })); stateset->addUniform(new osg::Uniform("screenRes", osg::Vec2f{ 1, 1 }));
if (Stereo::getMultiview()) if (Stereo::getMultiview())
{ {
// The above set the sky texture unit to 0. Normally this is fine since texture unit 0 is the sampler2d diffuseMap, which will be set. // Multiview needs a texture2DArray dummy texture applied here
// However, in multiview the sky texture is a sampler2darray, and so needs to be set separately with a dummy texture
osg::Texture2DArray* textureArray = new osg::Texture2DArray; osg::Texture2DArray* textureArray = new osg::Texture2DArray;
textureArray->setTextureSize(1, 1, 2); textureArray->setTextureSize(1, 1, 2);
textureArray->setName("fakeSkyTexture"); textureArray->setName("fakeSkyTexture");
@ -281,7 +280,6 @@ namespace MWRender
stateset->addUniform(new osg::Uniform("emissiveMult", 1.f)); stateset->addUniform(new osg::Uniform("emissiveMult", 1.f));
// Opaque stuff must have 1 as its fragment alpha as the FBO is translucent, so having blending off isn't enough // Opaque stuff must have 1 as its fragment alpha as the FBO is translucent, so having blending off isn't enough
osg::ref_ptr<osg::TexEnvCombine> noBlendAlphaEnv = new osg::TexEnvCombine(); osg::ref_ptr<osg::TexEnvCombine> noBlendAlphaEnv = new osg::TexEnvCombine();
noBlendAlphaEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE); noBlendAlphaEnv->setCombine_Alpha(osg::TexEnvCombine::REPLACE);

16
apps/openmw/mwrender/localmap.cpp
View file

@ -5,10 +5,10 @@
#include <osg/ComputeBoundsVisitor> #include <osg/ComputeBoundsVisitor>
#include <osg/Fog> #include <osg/Fog>
#include <osg/LightModel> #include <osg/LightModel>
#include <osg/Texture2DArray>
#include <osg/LightSource> #include <osg/LightSource>
#include <osg/PolygonMode> #include <osg/PolygonMode>
#include <osg/Texture2D> #include <osg/Texture2D>
#include <osg/Texture2DArray>
#include <osgDB/ReadFile> #include <osgDB/ReadFile>
@ -17,6 +17,8 @@
#include <components/esm3/loadcell.hpp> #include <components/esm3/loadcell.hpp>
#include <components/files/memorystream.hpp> #include <components/files/memorystream.hpp>
#include <components/misc/constants.hpp> #include <components/misc/constants.hpp>
#include <components/resource/resourcesystem.hpp>
#include <components/resource/scenemanager.hpp>
#include <components/sceneutil/depth.hpp> #include <components/sceneutil/depth.hpp>
#include <components/sceneutil/lightmanager.hpp> #include <components/sceneutil/lightmanager.hpp>
#include <components/sceneutil/nodecallback.hpp> #include <components/sceneutil/nodecallback.hpp>
@ -735,15 +737,18 @@ namespace MWRender
stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE); stateset->setAttributeAndModes(fog, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
// turn of sky blending // turn of sky blending
int skyTextureSlot = MWBase::Environment::get().getResourceSystem()->getSceneManager()->getShaderManager().reserveGlobalTextureUnits(Shader::ShaderManager::Slot::SkyTexture); int skyTextureSlot = MWBase::Environment::get()
.getResourceSystem()
->getSceneManager()
->getShaderManager()
.reserveGlobalTextureUnits(Shader::ShaderManager::Slot::SkyTexture);
stateset->addUniform(new osg::Uniform("far", 10000000.0f)); stateset->addUniform(new osg::Uniform("far", 10000000.0f));
stateset->addUniform(new osg::Uniform("skyBlendingStart", 8000000.0f)); stateset->addUniform(new osg::Uniform("skyBlendingStart", 8000000.0f));
stateset->addUniform(new osg::Uniform("sky", skyTextureSlot)); stateset->addUniform(new osg::Uniform("sky", skyTextureSlot));
stateset->addUniform(new osg::Uniform("screenRes", osg::Vec2f{ 1, 1 })); stateset->addUniform(new osg::Uniform("screenRes", osg::Vec2f{ 1, 1 }));
if (Stereo::getMultiview()) if (Stereo::getMultiview())
{ {
// The above set the sky texture unit to 0. Normally this is fine since texture unit 0 is the sampler2d diffuseMap, which will be set. // Multiview needs a texture2DArray dummy texture applied here
// However, in multiview the sky texture is a sampler2darray, and so needs to be set separately with a dummy texture
osg::Texture2DArray* textureArray = new osg::Texture2DArray; osg::Texture2DArray* textureArray = new osg::Texture2DArray;
textureArray->setTextureSize(1, 1, 2); textureArray->setTextureSize(1, 1, 2);
textureArray->setName("fakeSkyTexture"); textureArray->setName("fakeSkyTexture");
@ -752,7 +757,8 @@ namespace MWRender
textureArray->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE); textureArray->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
textureArray->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE); textureArray->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
textureArray->setWrap(osg::Texture::WRAP_R, osg::Texture::CLAMP_TO_EDGE); textureArray->setWrap(osg::Texture::WRAP_R, osg::Texture::CLAMP_TO_EDGE);
stateset->setTextureAttributeAndModes(skyTextureSlot, textureArray, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE | osg::StateAttribute::PROTECTED); stateset->setTextureAttributeAndModes(skyTextureSlot, textureArray,
osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE | osg::StateAttribute::PROTECTED);
} }
osg::ref_ptr<osg::LightModel> lightmodel = new osg::LightModel; osg::ref_ptr<osg::LightModel> lightmodel = new osg::LightModel;

1
components/sceneutil/mwshadowtechnique.cpp
View file

@ -1007,7 +1007,6 @@ void SceneUtil::MWShadowTechnique::copyShadowStateSettings(osgUtil::CullVisitor&
{ {
for (const auto& sd : vdd->getShadowDataList()) for (const auto& sd : vdd->getShadowDataList())
{ {
//assignTexGenSettings(&cv, sd->_camera, sd->_textureUnit, sd->_texgen);
assignValidRegionSettings(cv, sd->_camera, sd->_sm_i, vdd->_uniforms[cv.getTraversalNumber()%2]); assignValidRegionSettings(cv, sd->_camera, sd->_sm_i, vdd->_uniforms[cv.getTraversalNumber()%2]);
assignShadowStateSettings(cv, sd->_camera, sd->_sm_i, vdd->_uniforms[cv.getTraversalNumber()%2]); assignShadowStateSettings(cv, sd->_camera, sd->_sm_i, vdd->_uniforms[cv.getTraversalNumber()%2]);
} }