mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 20:23:54 +00:00
Code Issues Releases Wiki Activity

Merge branch 'noyoudumbtoolyourflipingwrong' into 'master'

Browse source 
Don't flip the water normal map twice

See merge request OpenMW/openmw!4022
This commit is contained in:
psi29a 2024-04-20 16:39:09 +00:00
commit ddd64c893a
2 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -715,8 +715,6 @@ namespace MWRender
osg::ref_ptr<osg::Texture2D> normalMap( osg::ref_ptr<osg::Texture2D> normalMap(
new osg::Texture2D(mResourceSystem->getImageManager()->getImage("textures/omw/water_nm.png"))); new osg::Texture2D(mResourceSystem->getImageManager()->getImage("textures/omw/water_nm.png")));
if (normalMap->getImage())
normalMap->getImage()->flipVertical();
normalMap->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT); normalMap->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT);
normalMap->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT); normalMap->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT);
normalMap->setMaxAnisotropy(16); normalMap->setMaxAnisotropy(16);

1
files/shaders/compatibility/water.frag
View file

@ -94,7 +94,6 @@ uniform vec2 screenRes;
void main(void) void main(void)
{ {
vec2 UV = worldPos.xy / (8192.0*5.0) * 3.0; vec2 UV = worldPos.xy / (8192.0*5.0) * 3.0;
UV.y *= -1.0;
float shadow = unshadowedLightRatio(linearDepth); float shadow = unshadowedLightRatio(linearDepth);