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

Addressing review comments

Browse source
This commit is contained in:
samcake 2018-02-09 10:02:16 -08:00
parent 0e25b7bd35
commit 4419dfe622
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
View file

@ -64,7 +64,6 @@ vec3 colorToLinearRGB(vec3 srgb) {
void main(void) { void main(void) {
outFragColor.a = 1.0; outFragColor.a = 1.0;
outFragColor.rgb = colorToLinearRGB(texture(colorMap, varTexCoord0).rgb); outFragColor.rgb = colorToLinearRGB(texture(colorMap, varTexCoord0).rgb);
// outFragColor.rgb = texture(colorMap, varTexCoord0).rgb;
} }
)SCRIBE"; )SCRIBE";

2
libraries/render-utils/src/ForwardGlobalLight.slh
View file

@ -134,6 +134,7 @@ vec3 evalSkyboxGlobalColor(mat4 invViewMat, float shadowAttenuation, float obscu
color += directionalDiffuse; color += directionalDiffuse;
color += directionalSpecular; color += directionalSpecular;
// FIXME - temporarily removed until we support it for forward...
// Attenuate the light if haze effect selected // Attenuate the light if haze effect selected
// if ((hazeParams.hazeMode & HAZE_MODE_IS_KEYLIGHT_ATTENUATED) == HAZE_MODE_IS_KEYLIGHT_ATTENUATED) { // if ((hazeParams.hazeMode & HAZE_MODE_IS_KEYLIGHT_ATTENUATED) == HAZE_MODE_IS_KEYLIGHT_ATTENUATED) {
// color = computeHazeColorKeyLightAttenuation(color, lightDirection, position); // color = computeHazeColorKeyLightAttenuation(color, lightDirection, position);
@ -227,6 +228,7 @@ vec3 evalGlobalLightingAlphaBlendedWithHaze(
color += directionalSpecular / opacity; color += directionalSpecular / opacity;
// Haze // Haze
// FIXME - temporarily removed until we support it for forward...
/* if ((hazeParams.hazeMode & HAZE_MODE_IS_ACTIVE) == HAZE_MODE_IS_ACTIVE) { /* if ((hazeParams.hazeMode & HAZE_MODE_IS_ACTIVE) == HAZE_MODE_IS_ACTIVE) {
vec4 colorV4 = computeHazeColor( vec4 colorV4 = computeHazeColor(
vec4(color, 1.0), // fragment original color vec4(color, 1.0), // fragment original color

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

@ -104,9 +104,6 @@ ShapeKey MeshPartPayload::getShapeKey() const {
if (drawMaterialKey.isNormalMap()) { if (drawMaterialKey.isNormalMap()) {
builder.withTangents(); builder.withTangents();
} }
/* if (drawMaterialKey.isMetallicMap()) {
builder.withSpecular();
}*/
if (drawMaterialKey.isLightmapMap()) { if (drawMaterialKey.isLightmapMap()) {
builder.withLightmap(); builder.withLightmap();
} }