Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-09 08:08:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing conflicts in shaders

Browse source
This commit is contained in:
Sam Gateau 2015-08-21 16:49:01 -07:00
parent a388ba7b00
commit 4fabc25b3e
2 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libraries/render-utils/src/DeferredBufferWrite.slh
View file

@ -21,11 +21,7 @@ uniform float glowIntensity;
// the alpha threshold // the alpha threshold
uniform float alphaThreshold; uniform float alphaThreshold;
<<<<<<< HEAD
uniform sampler2D normalFittingScaleMap;
=======
uniform sampler2D normalFittingMap; uniform sampler2D normalFittingMap;
>>>>>>> 518cf3be1504234eb0dc22906876e292b2186f57
vec3 bestFitNormal(vec3 normal) { vec3 bestFitNormal(vec3 normal) {
vec3 absNorm = abs(normal); vec3 absNorm = abs(normal);
@ -37,11 +33,8 @@ vec3 bestFitNormal(vec3 normal) {
texcoord = (texcoord.x < texcoord.y ? texcoord.yx : texcoord.xy); texcoord = (texcoord.x < texcoord.y ? texcoord.yx : texcoord.xy);
texcoord.y /= texcoord.x; texcoord.y /= texcoord.x;
vec3 cN = normal / maxNAbs; vec3 cN = normal / maxNAbs;
<<<<<<< HEAD
float fittingScale = texture2D(normalFittingScaleMap, texcoord).a;
=======
float fittingScale = texture(normalFittingMap, texcoord).a; float fittingScale = texture(normalFittingMap, texcoord).a;
>>>>>>> 518cf3be1504234eb0dc22906876e292b2186f57
cN *= fittingScale; cN *= fittingScale;
return (cN * 0.5 + 0.5); return (cN * 0.5 + 0.5);
} }
@ -57,15 +50,10 @@ void packDeferredFragment(vec3 normal, float alpha, vec3 diffuse, vec3 specular,
if (alpha != glowIntensity) { if (alpha != glowIntensity) {
discard; discard;
} }
<<<<<<< HEAD
gl_FragData[0] = vec4(diffuse.rgb, alpha);
gl_FragData[1] = vec4(bestFitNormal(normal), 1.0);
gl_FragData[2] = vec4(specular, shininess / 128.0);
=======
_fragColor0 = vec4(diffuse.rgb, alpha); _fragColor0 = vec4(diffuse.rgb, alpha);
_fragColor1 = vec4(bestFitNormal(normal), 1.0); _fragColor1 = vec4(bestFitNormal(normal), 1.0);
_fragColor2 = vec4(specular, shininess / 128.0); _fragColor2 = vec4(specular, shininess / 128.0);
>>>>>>> 518cf3be1504234eb0dc22906876e292b2186f57
} }
void packDeferredFragmentLightmap(vec3 normal, float alpha, vec3 diffuse, vec3 specular, float shininess, vec3 emissive) { void packDeferredFragmentLightmap(vec3 normal, float alpha, vec3 diffuse, vec3 specular, float shininess, vec3 emissive) {
@ -73,16 +61,10 @@ void packDeferredFragmentLightmap(vec3 normal, float alpha, vec3 diffuse, vec3 s
discard; discard;
} }
<<<<<<< HEAD
gl_FragData[0] = vec4(diffuse.rgb, alpha);
gl_FragData[1] = vec4(bestFitNormal(normal), 0.5);
gl_FragData[2] = vec4(emissive, shininess / 128.0);
=======
_fragColor0 = vec4(diffuse.rgb, alpha); _fragColor0 = vec4(diffuse.rgb, alpha);
//_fragColor1 = vec4(normal, 0.0) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0); //_fragColor1 = vec4(normal, 0.0) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0);
_fragColor1 = vec4(bestFitNormal(normal), 0.5); _fragColor1 = vec4(bestFitNormal(normal), 0.5);
_fragColor2 = vec4(emissive, shininess / 128.0); _fragColor2 = vec4(emissive, shininess / 128.0);
>>>>>>> 518cf3be1504234eb0dc22906876e292b2186f57
} }
void packDeferredFragmentTranslucent(vec3 normal, float alpha, vec3 diffuse, vec3 specular, float shininess) { void packDeferredFragmentTranslucent(vec3 normal, float alpha, vec3 diffuse, vec3 specular, float shininess) {

3
libraries/render-utils/src/Model.cpp
View file

@ -110,9 +110,6 @@ void Model::RenderPipelineLib::addRenderPipeline(Model::RenderKey key,
slotBindings.insert(gpu::Shader::Binding(std::string("lightBuffer"), 4)); slotBindings.insert(gpu::Shader::Binding(std::string("lightBuffer"), 4));
slotBindings.insert(gpu::Shader::Binding(std::string("normalFittingMap"), DeferredLightingEffect::NORMAL_FITTING_MAP_SLOT)); slotBindings.insert(gpu::Shader::Binding(std::string("normalFittingMap"), DeferredLightingEffect::NORMAL_FITTING_MAP_SLOT));
slotBindings.insert(gpu::Shader::Binding(std::string("normalFittingScaleMap"), 4));
gpu::ShaderPointer program = gpu::ShaderPointer(gpu::Shader::createProgram(vertexShader, pixelShader)); gpu::ShaderPointer program = gpu::ShaderPointer(gpu::Shader::createProgram(vertexShader, pixelShader));
gpu::Shader::makeProgram(*program, slotBindings); gpu::Shader::makeProgram(*program, slotBindings);