Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 13:43:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

maybe ready for master

Browse source
This commit is contained in:
Sam Gateau 2015-05-20 14:34:02 -07:00
parent a649d9edb0
commit 3ad7bdc79e
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -3302,7 +3302,7 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs
skybox = skyStage->getSkybox();
if (skybox) {
gpu::Batch batch;
model::Skybox::render(batch, _viewFrustum, *skybox);
model::Skybox::render(batch, *getDisplayViewFrustum(), *skybox);
gpu::GLBackend::renderBatch(batch);
glUseProgram(0);

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

@ -43,12 +43,8 @@ void packDeferredFragment(vec3 normal, float alpha, vec3 diffuse, vec3 specular,
discard;
}
gl_FragData[0] = vec4(diffuse.rgb, alpha);
if ( gl_FragCoord.x > 1024) {
gl_FragData[1] = vec4(normal * 0.5 + vec3(0.5), 1.0);
} else {
gl_FragData[1] = vec4(bestFitNormal(normal), 1.0);
}
gl_FragData[2] = vec4(specular, shininess / 100.0);
gl_FragData[1] = vec4(bestFitNormal(normal), 1.0);
gl_FragData[2] = vec4(specular, shininess / 128.0);
}
void packDeferredFragmentLightmap(vec3 normal, float alpha, vec3 diffuse, vec3 specular, float shininess, vec3 emissive) {