From b3db4f1c27ef73f5175d020d844ffc7bff05cee0 Mon Sep 17 00:00:00 2001 From: scrawl Date: Tue, 28 Feb 2012 15:20:46 +0100 Subject: [PATCH 1/2] slightly improved moon fading --- apps/openmw/mwrender/sky.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp index 448050240b..23d99b6cd6 100644 --- a/apps/openmw/mwrender/sky.cpp +++ b/apps/openmw/mwrender/sky.cpp @@ -167,6 +167,8 @@ Moon::Moon( const String& textureName, "{ \n" " float4 tex = tex2D(texture, uv); \n" " oColor = float4(emissive.xyz,1) * tex2D(texture, uv) * float4(1,1,1,diffuse.a); \n" + " float bump = pow((1-diffuse.a),4); \n" + " oColor.rgb += float3(bump, bump, bump)*0.5; \n" "}"; fshader->setSource(outStream2.str()); fshader->load(); From c8aab3a562bba4beb6290bf81f2b17cdb9cf1254 Mon Sep 17 00:00:00 2001 From: scrawl Date: Tue, 28 Feb 2012 20:28:46 +0100 Subject: [PATCH 2/2] fix sun angle --- apps/openmw/mwrender/renderingmanager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp index 797e3c400a..7b58a80d76 100644 --- a/apps/openmw/mwrender/renderingmanager.cpp +++ b/apps/openmw/mwrender/renderingmanager.cpp @@ -310,7 +310,10 @@ void RenderingManager::sunDisable() void RenderingManager::setSunDirection(const Ogre::Vector3& direction) { - if (mSun) mSun->setDirection(Vector3(direction.x, -direction.z, direction.y)); + // direction * -1 (because 'direction' is camera to sun vector and not sun to camera), + // then convert from MW to ogre coordinates (swap y,z and make y negative) + if (mSun) mSun->setDirection(Vector3(-direction.x, -direction.z, direction.y)); + mSkyManager->setSunDirection(direction); }