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

correction

Browse source
This commit is contained in:
scrawl 2012-07-14 18:44:03 +02:00
parent 93c641efa7
commit 29f91753f7
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -87,7 +87,7 @@ namespace MWRender
int TerrainMaterial::Profile::getLayersPerPass () const int TerrainMaterial::Profile::getLayersPerPass () const
{ {
return 12; return 11;
} }
void TerrainMaterial::Profile::createPass (int index, const Ogre::Terrain* terrain) void TerrainMaterial::Profile::createPass (int index, const Ogre::Terrain* terrain)

7
files/materials/terrain.shader
View file

@ -90,18 +90,17 @@
float4 blendValues@shIterator = shSample(blendMap@shIterator, UV); float4 blendValues@shIterator = shSample(blendMap@shIterator, UV);
@shEndForeach @shEndForeach
float blendAmount;
float3 albedo; float3 albedo;
@shForeach(@shPropertyString(num_layers)) @shForeach(@shPropertyString(num_layers))
#if IS_FIRST_PASS == 1 && @shIterator == 0 #if IS_FIRST_PASS == 1 && @shIterator == 0
// first layer of first pass doesn't need a blend map // first layer of first pass doesn't need a blend map
albedo = shSample(diffuseMap0, UV * 5).rgb; albedo = shSample(diffuseMap0, UV * 10).rgb;
#else #else
blendAmount = blendValues@shPropertyString(blendmap_index_@shIterator).@shPropertyString(blendmap_component_@shIterator); #define BLEND_AMOUNT blendValues@shPropertyString(blendmap_index_@shIterator).@shPropertyString(blendmap_component_@shIterator)
albedo += shSample(diffuseMap@shIterator, UV * 5).rgb * blendAmount; albedo = shLerp(albedo, shSample(diffuseMap@shIterator, UV * 10).rgb, BLEND_AMOUNT);
#endif #endif
@shEndForeach @shEndForeach