sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed a bug with normals in TerrainLighting material

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7796 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
bre..ns 2011-07-01 17:53:21 +00:00
parent 108e124323
commit 8c7469d210
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/terrain/Common/MatDefs/Terrain/TerrainLighting.frag
View File

@ -648,7 +648,7 @@ void main(){
//--------------------- //---------------------
// normal calculations // normal calculations
//--------------------- //---------------------
#if defined(NORMALMAP) || defined(NORMALMAP_1) || defined(NORMALMAP_2) || defined(NORMALMAP_3) #if defined(NORMALMAP) || defined(NORMALMAP_1) || defined(NORMALMAP_2) || defined(NORMALMAP_3) || defined(NORMALMAP_4) || defined(NORMALMAP_5) || defined(NORMALMAP_6) || defined(NORMALMAP_7) || defined(NORMALMAP_8) || defined(NORMALMAP_9) || defined(NORMALMAP_10) || defined(NORMALMAP_11)
#ifdef TRI_PLANAR_MAPPING #ifdef TRI_PLANAR_MAPPING
vec3 normal = calculateNormalTriPlanar(wNormal, wVertex, texCoord); vec3 normal = calculateNormalTriPlanar(wNormal, wVertex, texCoord);
#else #else

2
engine/src/terrain/Common/MatDefs/Terrain/TerrainLighting.vert
View File

@ -61,7 +61,7 @@ void main(){
//-------------------------- //--------------------------
// specific to normal maps: // specific to normal maps:
//-------------------------- //--------------------------
#if defined(NORMALMAP) || defined(NORMALMAP_1) || defined(NORMALMAP_2) || defined(NORMALMAP_3) #if defined(NORMALMAP) || defined(NORMALMAP_1) || defined(NORMALMAP_2) || defined(NORMALMAP_3) || defined(NORMALMAP_4) || defined(NORMALMAP_5) || defined(NORMALMAP_6) || defined(NORMALMAP_7) || defined(NORMALMAP_8) || defined(NORMALMAP_9) || defined(NORMALMAP_10) || defined(NORMALMAP_11)
vec3 wvTangent = normalize(g_NormalMatrix * inTangent.xyz); vec3 wvTangent = normalize(g_NormalMatrix * inTangent.xyz);
vec3 wvBinormal = cross(wvNormal, wvTangent); vec3 wvBinormal = cross(wvNormal, wvTangent);