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

Glow fix for simple shader.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-09-15 17:33:07 -07:00
parent da05d37015
commit 7580a1da89
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/shaders/simple.frag
View file

@ -14,9 +14,12 @@
// the interpolated normal // the interpolated normal
varying vec4 normal; varying vec4 normal;
// the glow intensity
uniform float glowIntensity;
void main(void) { void main(void) {
// set the diffuse, normal, specular data // set the diffuse, normal, specular data
gl_FragData[0] = vec4(gl_Color.rgb, 0.0); gl_FragData[0] = vec4(gl_Color.rgb, glowIntensity);
gl_FragData[1] = normalize(normal) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0); gl_FragData[1] = normalize(normal) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0);
gl_FragData[2] = vec4(gl_FrontMaterial.specular.rgb, gl_FrontMaterial.shininess / 128.0); gl_FragData[2] = vec4(gl_FrontMaterial.specular.rgb, gl_FrontMaterial.shininess / 128.0);
} }

5
interface/src/renderer/DeferredLightingEffect.cpp
View file

@ -23,6 +23,10 @@ void DeferredLightingEffect::init() {
_simpleProgram.addShaderFromSourceFile(QGLShader::Fragment, Application::resourcesPath() + "shaders/simple.frag"); _simpleProgram.addShaderFromSourceFile(QGLShader::Fragment, Application::resourcesPath() + "shaders/simple.frag");
_simpleProgram.link(); _simpleProgram.link();
_simpleProgram.bind();
_glowIntensityLocation = _simpleProgram.uniformLocation("glowIntensity");
_simpleProgram.release();
loadLightProgram("shaders/directional_light.frag", _directionalLight, _directionalLightLocations); loadLightProgram("shaders/directional_light.frag", _directionalLight, _directionalLightLocations);
loadLightProgram("shaders/directional_light_shadow_map.frag", _directionalLightShadowMap, loadLightProgram("shaders/directional_light_shadow_map.frag", _directionalLightShadowMap,
_directionalLightShadowMapLocations); _directionalLightShadowMapLocations);
@ -33,6 +37,7 @@ void DeferredLightingEffect::init() {
void DeferredLightingEffect::bindSimpleProgram() { void DeferredLightingEffect::bindSimpleProgram() {
Application::getInstance()->getTextureCache()->setPrimaryDrawBuffers(true, true, true); Application::getInstance()->getTextureCache()->setPrimaryDrawBuffers(true, true, true);
_simpleProgram.bind(); _simpleProgram.bind();
_simpleProgram.setUniformValue(_glowIntensityLocation, Application::getInstance()->getGlowEffect()->getIntensity());
glDisable(GL_BLEND); glDisable(GL_BLEND);
} }

1
interface/src/renderer/DeferredLightingEffect.h
View file

@ -67,6 +67,7 @@ private:
static void loadLightProgram(const char* name, ProgramObject& program, LightLocations& locations); static void loadLightProgram(const char* name, ProgramObject& program, LightLocations& locations);
ProgramObject _simpleProgram; ProgramObject _simpleProgram;
int _glowIntensityLocation;
ProgramObject _directionalLight; ProgramObject _directionalLight;
LightLocations _directionalLightLocations; LightLocations _directionalLightLocations;