sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated PhongLighting shader 

I can't remember why I commented these lines.


Former-commit-id: 3da37915073f94c9c44adfd84c968cb2d70982cf
This commit is contained in:
Lynix 2014-07-24 09:45:42 +02:00
parent 8b34e21e2f
commit bd0f38092e
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Nazara/Graphics/Resources/Shaders/PhongLighting/compatibility.vert
View File

@ -61,9 +61,9 @@ void main()
#endif #endif
#if TEXTURE_MAPPING #if TEXTURE_MAPPING
/* #if FLAG_FLIP_UVS #if FLAG_FLIP_UVS
vTexCoord = vec2(VertexTexCoord.x, 1.0 - VertexTexCoord.y); vTexCoord = vec2(VertexTexCoord.x, 1.0 - VertexTexCoord.y);
#else*/ #else
vTexCoord = VertexTexCoord; vTexCoord = VertexTexCoord;
#endif #endif
#endif #endif

2
src/Nazara/Graphics/Resources/Shaders/PhongLighting/compatibility.vert.h
View File

File diff suppressed because one or more lines are too long

10
src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.vert
View File

@ -44,7 +44,7 @@ void main()
#endif #endif
#endif #endif
//#if LIGHTING #if LIGHTING
#if FLAG_INSTANCING #if FLAG_INSTANCING
mat3 rotationMatrix = mat3(InstanceData0); mat3 rotationMatrix = mat3(InstanceData0);
#else #else
@ -59,14 +59,14 @@ void main()
#else #else
vNormal = normalize(rotationMatrix * VertexNormal); vNormal = normalize(rotationMatrix * VertexNormal);
#endif #endif
//#endif #endif
#if TEXTURE_MAPPING #if TEXTURE_MAPPING
/* #if FLAG_FLIP_UVS #if FLAG_FLIP_UVS
vTexCoord = vec2(VertexTexCoord.x, 1.0 - VertexTexCoord.y); vTexCoord = vec2(VertexTexCoord.x, 1.0 - VertexTexCoord.y);
#else*/ #else
vTexCoord = VertexTexCoord; vTexCoord = VertexTexCoord;
// #endif #endif
#endif #endif
#if LIGHTING && PARALLAX_MAPPING #if LIGHTING && PARALLAX_MAPPING

2
src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.vert.h
View File

File diff suppressed because one or more lines are too long