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

Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows

Browse source
This commit is contained in:
Zach Pomerantz 2016-01-22 10:32:54 -08:00
commit b62fc50557
4 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/render-utils/src/AmbientOcclusionEffect.h
View file

@ -106,7 +106,7 @@ private:
// Dithering info // Dithering info
glm::vec4 ditheringInfo { 0.0f, 0.0f, 0.01f, 1.0f }; glm::vec4 ditheringInfo { 0.0f, 0.0f, 0.01f, 1.0f };
// Sampling info // Sampling info
glm::vec4 sampleInfo { 11.0f, 1.0/11.0f, 7.0f, 1.0f }; glm::vec4 sampleInfo { 11.0f, 1.0f/11.0f, 7.0f, 1.0f };
// Blurring info // Blurring info
glm::vec4 blurInfo { 1.0f, 3.0f, 2.0f, 0.0f }; glm::vec4 blurInfo { 1.0f, 3.0f, 2.0f, 0.0f };
// gaussian distribution coefficients first is the sampling radius (max is 6) // gaussian distribution coefficients first is the sampling radius (max is 6)

6
libraries/render-utils/src/ssao.slh
View file

@ -146,12 +146,10 @@ float[](0.153170, 0.144893, 0.122649, 0.092902, 0.062970); // stddev = 2.0
int getBlurRadius() { int getBlurRadius() {
return BLUR_RADIUS; return BLUR_RADIUS;
return int(params._blurInfo.y);
} }
float getBlurCoef(int c) { float getBlurCoef(int c) {
return gaussian[c]; return gaussian[c];
return params._gaussianCoefs[c];
} }
#else #else
int getBlurRadius() { int getBlurRadius() {
@ -182,8 +180,8 @@ vec2 fetchOcclusionDepth(ivec2 coords) {
return unpackOcclusionDepth(texelFetch(occlusionMap, coords, 0).xyz); return unpackOcclusionDepth(texelFetch(occlusionMap, coords, 0).xyz);
} }
const int RADIUS_SCALE = 2; const int RADIUS_SCALE = 1;
const float BLUR_WEIGHT_OFFSET = 0.3; const float BLUR_WEIGHT_OFFSET = 0.05;
const float BLUR_EDGE_SCALE = 2000.0; const float BLUR_EDGE_SCALE = 2000.0;
vec2 evalTapWeightedValue(ivec3 side, int r, ivec2 ssC, float key) { vec2 evalTapWeightedValue(ivec3 side, int r, ivec2 ssC, float key) {

1
libraries/render-utils/src/ssao_makeHorizontalBlur.slf
View file

@ -15,7 +15,6 @@ const ivec2 horizontal = ivec2(1,0);
<$declareBlurPass(horizontal)$> <$declareBlurPass(horizontal)$>
in vec2 varTexCoord0;
out vec4 outFragColor; out vec4 outFragColor;
void main(void) { void main(void) {

1
libraries/render-utils/src/ssao_makeVerticalBlur.slf
View file

@ -13,7 +13,6 @@
const ivec2 vertical = ivec2(0,1); const ivec2 vertical = ivec2(0,1);
<$declareBlurPass(vertical)$> <$declareBlurPass(vertical)$>
in vec2 varTexCoord0;
out vec4 outFragColor; out vec4 outFragColor;
void main(void) { void main(void) {