Showing the changes to libraries/render-utils/src/DebugDeferredBuffer.cpp (1 of 5 files). Show all
Unified · Split
| @@ -85,13 +85,30 @@ static const std::string DEFAULT_NORMAL_SHADER { · 84 unmodified lines | |||
| 85 | " return vec4(vec3(0.5) + (frag.normal * 0.5), 1.0);" | 85 | " return vec4(vec3(0.5) + (frag.normal * 0.5), 1.0);" |
| 86 | " }" | 86 | " }" |
| 87 | }; | 87 | }; |
| 88 | 88 | /* | |
| 89 | static const std::string DEFAULT_OCCLUSION_SHADER{ | 89 | static const std::string DEFAULT_OCCLUSION_SHADER{ |
| 90 | "vec4 getFragmentColor() {" | 90 | "vec4 getFragmentColor() {" |
| 91 | " DeferredFragment frag = unpackDeferredFragmentNoPosition(uv);" | 91 | // " DeferredFragment frag = unpackDeferredFragmentNoPosition(uv);" |
| 92 | " return vec4(vec3(pow(frag.obscurance, 1.0 / 2.2)), 1.0);" | 92 | // " return vec4(vec3(pow(frag.obscurance, 1.0 / 2.2)), 1.0);" |
| 93 | // " return vec4(vec3(pow(texture(specularMap, uv).a, 1.0 / 2.2)), 1.0);" | ||
| 94 | " return vec4(vec3(texture(specularMap, uv).w), 1.0);" | ||
| 93 | " }" | 95 | " }" |
| 94 | }; | 96 | }; |
| 97 | */ | ||
| 98 | static const std::string DEFAULT_OCCLUSION_SHADER{ | ||
| 99 | "vec4 getFragmentColor() {" | ||
| 100 | // " DeferredFragment frag = unpackDeferredFragmentNoPosition(uv);" | ||
| 101 | // " return vec4(vec3(pow(frag.obscurance, 1.0 / 2.2)), 1.0);" | ||
| 102 | " vec4 midNormalCurvature;" | ||
| 103 | " vec4 lowNormalCurvature;" | ||
| 104 | " unpackMidLowNormalCurvature(uv, midNormalCurvature, lowNormalCurvature);" | ||
| 105 | " float ambientOcclusion = curvatureAO(lowNormalCurvature.a * 20.0f) * 0.5f;" | ||
| 106 | " float ambientOcclusionHF = curvatureAO(midNormalCurvature.a * 8.0f) * 0.5f;" | ||
| 107 | " ambientOcclusion = min(ambientOcclusion, ambientOcclusionHF);" | ||
| 108 | " return vec4(vec3(ambientOcclusion), 1.0);" | ||
| 109 | " }" | ||
| 110 | }; | ||
| 111 | |||
| 95 | 112 | ||
| 96 | static const std::string DEFAULT_EMISSIVE_SHADER{ | 113 | static const std::string DEFAULT_EMISSIVE_SHADER{ |
| 97 | "vec4 getFragmentColor() {" | 114 | "vec4 getFragmentColor() {" |