Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine into Documentation-Update

Former-commit-id: 601bee6e41fcb3951f3ae9070a277896aeb52d80 [formerly ea8c1543b3df294643130613a6df14ad17bc1dd5] Former-commit-id: 08bda7de77c7615d6ba76eed38075a0c667ff72d
2016-06-06 19:33:33 +02:00
parent db8a222f62 f9d6cfcf07
commit 363299f4de
61 changed files with 2892 additions and 76 deletions
--- a/src/Nazara/Graphics/Resources/Shaders/Basic/core.vert.h
+++ b/src/Nazara/Graphics/Resources/Shaders/Basic/core.vert.h
--- a/src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.frag
+++ b/src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.frag
@@ -94,6 +94,7 @@ float VectorToDepthValue(vec3 vec, float zNear, float zFar)
 	return (normZ + 1.0) * 0.5;
 }

+#if SHADOW_MAPPING
 float CalculateDirectionalShadowFactor(int lightIndex)
 {
 	vec4 lightSpacePos = vLightSpacePos[lightIndex];
@@ -119,6 +120,7 @@ float CalculateSpotShadowFactor(int lightIndex)
 	
 	return visibility;
 }
+#endif

 void main()
 {
--- a/src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.frag.h
+++ b/src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.frag.h
--- a/src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.vert.h
+++ b/src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.vert.h