mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-13 07:14:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote branch 'scrawl/weather' into next

Browse Source
This commit is contained in:
Marc Zinnschlag 2012-02-28 23:33:22 +01:00
commit ed0fa255b0
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openmw/mwrender/renderingmanager.cpp
View File

@ -310,7 +310,10 @@ void RenderingManager::sunDisable()
void RenderingManager::setSunDirection(const Ogre::Vector3& direction) 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); mSkyManager->setSunDirection(direction);
} }

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

@ -167,6 +167,8 @@ Moon::Moon( const String& textureName,
"{ \n" "{ \n"
" float4 tex = tex2D(texture, uv); \n" " float4 tex = tex2D(texture, uv); \n"
" oColor = float4(emissive.xyz,1) * tex2D(texture, uv) * float4(1,1,1,diffuse.a); \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->setSource(outStream2.str());
fshader->load(); fshader->load();