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

Fixed ShaderBuilder code with old hardware 

Former-commit-id: b837de273f7e685c54c6133faed3a1171222b702
This commit is contained in:
Lynix 2013-04-06 00:13:25 +02:00
parent dd7025eae2
commit 1c59676051
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Nazara/Renderer/ShaderBuilder.cpp
View File

@ -11,6 +11,8 @@
#include <unordered_map> #include <unordered_map>
#include <Nazara/Renderer/Debug.hpp> #include <Nazara/Renderer/Debug.hpp>
///TODO: Remplacer par les ShaderNode
namespace namespace
{ {
std::unordered_map<nzUInt32, NzResourceRef<NzShader>> s_shaders; std::unordered_map<nzUInt32, NzResourceRef<NzShader>> s_shaders;
@ -23,6 +25,7 @@ namespace
NzString inKW = (glsl140) ? "in" : "varying"; NzString inKW = (glsl140) ? "in" : "varying";
NzString fragmentColorKW = (glsl140) ? "RenderTarget0" : "gl_FragColor"; NzString fragmentColorKW = (glsl140) ? "RenderTarget0" : "gl_FragColor";
NzString textureLookupKW = (glsl140) ? "texture" : "texture2D";
NzString sourceCode; NzString sourceCode;
sourceCode.Reserve(1024); // Le shader peut faire plus, mais cela évite déjà beaucoup de petites allocations sourceCode.Reserve(1024); // Le shader peut faire plus, mais cela évite déjà beaucoup de petites allocations
@ -129,7 +132,7 @@ namespace
sourceCode += "vec3 si = vec3(0.0, 0.0, 0.0);\n"; sourceCode += "vec3 si = vec3(0.0, 0.0, 0.0);\n";
if (flags & nzShaderFlags_NormalMapping) if (flags & nzShaderFlags_NormalMapping)
sourceCode += "vec3 normal = normalize(vLightToWorld * (2.0 * vec3(texture2D(MaterialNormalMap, vTexCoord)) - 1.0));\n"; sourceCode += "vec3 normal = normalize(vLightToWorld * (2.0 * vec3(" + textureLookupKW + "(MaterialNormalMap, vTexCoord)) - 1.0));\n";
else else
sourceCode += "vec3 normal = normalize(vNormal);\n"; sourceCode += "vec3 normal = normalize(vNormal);\n";
@ -267,15 +270,15 @@ namespace
sourceCode += fragmentColorKW + " = vec4(light, MaterialDiffuse.a)"; sourceCode += fragmentColorKW + " = vec4(light, MaterialDiffuse.a)";
if (flags & nzShaderFlags_DiffuseMapping) if (flags & nzShaderFlags_DiffuseMapping)
sourceCode += "*texture2D(MaterialDiffuseMap, vTexCoord)"; sourceCode += '*' + textureLookupKW + "(MaterialDiffuseMap, vTexCoord)";
if (flags & nzShaderFlags_SpecularMapping) if (flags & nzShaderFlags_SpecularMapping)
sourceCode += " + vec4(si, MaterialDiffuse.a)*texture2D(MaterialSpecularMap, vTexCoord)"; // Utiliser l'alpha de MaterialSpecular n'aurait aucun sens sourceCode += " + vec4(si, MaterialDiffuse.a)*" + textureLookupKW + "(MaterialSpecularMap, vTexCoord)"; // Utiliser l'alpha de MaterialSpecular n'aurait aucun sens
sourceCode += ";\n"; sourceCode += ";\n";
} }
else if (flags & nzShaderFlags_DiffuseMapping) else if (flags & nzShaderFlags_DiffuseMapping)
sourceCode += fragmentColorKW + " = texture2D(MaterialDiffuseMap, vTexCoord);\n"; sourceCode += fragmentColorKW + " = " + textureLookupKW + "(MaterialDiffuseMap, vTexCoord);\n";
else else
sourceCode += fragmentColorKW + " = MaterialDiffuse;\n"; sourceCode += fragmentColorKW + " = MaterialDiffuse;\n";
@ -467,7 +470,7 @@ const NzShader* NzShaderBuilder::Get(nzUInt32 flags)
NzShader* shader = BuildShader(flags); NzShader* shader = BuildShader(flags);
if (!shader) if (!shader)
{ {
NazaraWarning("Failed to build shader (flags: 0x" + NzString::Number(flags, 16) + ", using default one..."); NazaraWarning("Failed to build shader (flags: 0x" + NzString::Number(flags, 16) + "), using default one...");
shader = s_shaders[0]; // Shader par défaut shader = s_shaders[0]; // Shader par défaut
} }