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

Former-commit-id: 866c0778a3dcdc259618e577649a1116ae3a57e8 [formerly 4905c256960813c8f7b9c5e15b70ba906baa0b90] Former-commit-id: b880a6fe12f937c5cd766a8cf37fd6794d146e84
2016-06-06 19:33:33 +02:00
parent abb5ab3596 48a7ba0114
commit 05e4eaabbc
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