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

Some cleanup, still trying to solve the problem

Browse source
This commit is contained in:
Olivier Prat 2018-09-18 08:45:04 +02:00
parent 0f467ceeb9
commit c27f3dcafe
7 changed files with 43 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -375,7 +375,7 @@ const gpu::PipelinePointer& AmbientOcclusionEffect::getVBlurPipeline() {
const gpu::PipelinePointer& AmbientOcclusionEffect::getMipCreationPipeline() { const gpu::PipelinePointer& AmbientOcclusionEffect::getMipCreationPipeline() {
if (!_mipCreationPipeline) { if (!_mipCreationPipeline) {
_mipCreationPipeline = gpu::Context::createMipGenerationPipeline(gpu::Shader::createPixel(shader::render_utils::fragment::mip_depth_median)); _mipCreationPipeline = gpu::Context::createMipGenerationPipeline(gpu::Shader::createPixel(shader::render_utils::fragment::ssao_mip_depth));
} }
return _mipCreationPipeline; return _mipCreationPipeline;
} }

2
libraries/render-utils/src/DebugDeferredBuffer.cpp
View file

@ -384,7 +384,7 @@ void DebugDeferredBuffer::configure(const Config& config) {
auto& parameters = _parameters.edit(); auto& parameters = _parameters.edit();
_mode = (Mode)config.mode; _mode = (Mode)config.mode;
_size = config.size; _size = glm::vec4{config.debugCursorTexcoord.x*2.0f - 1.0f, -1.0f, 1.0f, 1.0f};
parameters._shadowCascadeIndex = glm::clamp(_mode - Mode::ShadowCascade0Mode, 0, (int)SHADOW_CASCADE_MAX_COUNT - 1); parameters._shadowCascadeIndex = glm::clamp(_mode - Mode::ShadowCascade0Mode, 0, (int)SHADOW_CASCADE_MAX_COUNT - 1);
} }

4
libraries/render-utils/src/DebugDeferredBuffer.h
View file

@ -25,14 +25,14 @@ class DebugDeferredBufferConfig : public render::Job::Config {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool enabled MEMBER enabled) Q_PROPERTY(bool enabled MEMBER enabled)
Q_PROPERTY(int mode MEMBER mode WRITE setMode) Q_PROPERTY(int mode MEMBER mode WRITE setMode)
Q_PROPERTY(glm::vec4 size MEMBER size NOTIFY dirty) Q_PROPERTY(glm::vec2 debugCursorTexcoord MEMBER debugCursorTexcoord NOTIFY dirty)
public: public:
DebugDeferredBufferConfig() : render::Job::Config(false) {} DebugDeferredBufferConfig() : render::Job::Config(false) {}
void setMode(int newMode); void setMode(int newMode);
int mode{ 0 }; int mode{ 0 };
glm::vec4 size{ 0.0f, -1.0f, 1.0f, 1.0f }; glm::vec2 debugCursorTexcoord{ 0.5f, 0.5f };
signals: signals:
void dirty(); void dirty();
}; };

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

@ -249,14 +249,12 @@ vec3 fetchTapUnfiltered(ivec4 side, ivec2 ssC, vec3 tap, vec2 sideImageSize) {
return P; return P;
} }
vec4 fetchTap(ivec4 side, ivec2 ssC, vec3 tap, vec2 sideImageSize) { vec4 fetchTap(ivec4 side, vec2 tapPixelPos, float tapRadius, vec2 sideImageSize) {
int mipLevel = evalMipFromRadius(tap.z * float(doFetchMips())); int mipLevel = evalMipFromRadius(tapRadius * float(doFetchMips()));
vec2 ssP = tap.xy + vec2(ssC);
// We need to divide by 2^mipLevel to read the appropriately scaled coordinate from a MIP-map. // We need to divide by 2^mipLevel to read the appropriately scaled coordinate from a MIP-map.
// Manually clamp to the texture size because texelFetch bypasses the texture unit // Manually clamp to the texture size because texelFetch bypasses the texture unit
vec2 tapUV = (vec2(ssP) + vec2(0.5)) / sideImageSize; vec2 tapUV = (tapPixelPos + vec2(0.5)) / sideImageSize;
vec2 fetchUV = vec2(tapUV.x + side.w * 0.5 * (side.x - tapUV.x), tapUV.y); vec2 fetchUV = vec2(tapUV.x + side.w * 0.5 * (side.x - tapUV.x), tapUV.y);
vec4 P; vec4 P;
@ -293,44 +291,21 @@ float evalVisibilitySSAO(in vec3 centerPosition, in vec3 centerNormal, in vec3 t
float computeHorizonFromTap(vec3 tapPositionES, vec3 fragPositionES, vec3 fragNormalES) { float computeHorizonFromTap(vec3 tapPositionES, vec3 fragPositionES, vec3 fragNormalES) {
vec3 deltaVec = tapPositionES - fragPositionES; vec3 deltaVec = tapPositionES - fragPositionES;
float distanceSquared = dot(deltaVec, deltaVec); float distanceSquared = dot(deltaVec, deltaVec);
float horizon = dot(normalize(deltaVec), fragNormalES); float cosHorizonAngle = dot(normalize(deltaVec), fragNormalES);
float radiusFalloff = max(0.0, 1.0 - (distanceSquared / getRadius2())); float radiusFalloff = max(0.0, 1.0 - (distanceSquared / getRadius2()));
horizon = max(0.0, (horizon - getFalloffAngle()) / (1.0 - getFalloffAngle())); cosHorizonAngle = max(0.0, (cosHorizonAngle - getFalloffAngle()) / (1.0 - getFalloffAngle()));
horizon *= radiusFalloff; cosHorizonAngle *= radiusFalloff;
return horizon; return cosHorizonAngle;
}
vec2 clampSearchVector(vec2 sideImageSize, vec2 shadedPixelPos, vec2 searchVec) {
vec2 clampedSearchVec = searchVec;
vec2 endPixel = shadedPixelPos + clampedSearchVec;
if (endPixel.x < 0) {
clampedSearchVec *= ((0-shadedPixelPos.x) / clampedSearchVec.x);
endPixel = shadedPixelPos + clampedSearchVec;
}
if (endPixel.x > (sideImageSize.x-1)) {
clampedSearchVec *= ((sideImageSize.x-1-shadedPixelPos.x) / clampedSearchVec.x);
endPixel = shadedPixelPos + clampedSearchVec;
}
if (endPixel.y < 0) {
clampedSearchVec *= ((0-shadedPixelPos.y) / clampedSearchVec.y);
endPixel = shadedPixelPos + clampedSearchVec;
}
if (endPixel.y > (sideImageSize.y-1)) {
clampedSearchVec *= ((sideImageSize.y-1-shadedPixelPos.y) / clampedSearchVec.y);
}
return clampedSearchVec;
} }
<@func computeHorizon()@> <@func computeHorizon()@>
if (tapPixelPos.x>=0 && tapPixelPos.y>=0 && tapPixelPos.x<sideImageSize.x && tapPixelPos.y<sideImageSize.y) { vec2 tapPixelPos = tapPixelOffset + shadedPixelPos;
if (tapPixelPos.x<0 && tapPixelPos.y<0 && tapPixelPos.x>=sideImageSize.x && tapPixelPos.y>=sideImageSize.y) {
break; break;
} }
vec3 tap = vec3(tapPixelPos, radius); vec4 tapUVZ_mip = fetchTap(side, tapPixelPos, radius, sideImageSize);
vec4 tapUVZ_mip = fetchTap(side, shadedPixelPos, tap, sideImageSize);
vec3 tapPositionES = evalEyePositionFromZeye(side.x, tapUVZ_mip.z, tapUVZ_mip.xy); vec3 tapPositionES = evalEyePositionFromZeye(side.x, tapUVZ_mip.z, tapUVZ_mip.xy);
float tapCosHorizonAngle = computeHorizonFromTap(tapPositionES, fragPositionES, fragNormalES); float tapCosHorizonAngle = computeHorizonFromTap(tapPositionES, fragPositionES, fragNormalES);
@ -338,26 +313,25 @@ vec2 clampSearchVector(vec2 sideImageSize, vec2 shadedPixelPos, vec2 searchVec)
<@endfunc@> <@endfunc@>
#define SSAO_LINEAR_SAMPLING 1 #define SSAO_LINEAR_SEARCH_HORIZON 1
float computeHorizon(ivec4 side, ivec2 shadedPixelPos, vec2 sideImageSize, vec2 deltaTap, float computeHorizon(ivec4 side, vec2 shadedPixelPos, vec2 sideImageSize, vec2 deltaTap,
vec3 fragPositionES, vec3 fragNormalES, vec2 searchVec) { vec3 fragPositionES, vec3 fragNormalES, vec2 searchVec, float searchRadius) {
vec2 absSearchVec = abs(searchVec); vec2 absSearchVec = abs(searchVec);
int stepCount = int(max(absSearchVec.x, absSearchVec.y)); int stepCount = int(ceil(max(absSearchVec.x, absSearchVec.y)));
float cosHorizonAngle = 0.0; float cosHorizonAngle = 0.0;
if (stepCount>0) { if (stepCount>0) {
vec2 deltaPixelTap = searchVec / float(stepCount); vec2 deltaPixelTap = searchVec / float(stepCount);
float searchRadius = length(searchVec);
float deltaRadius = searchRadius / float(stepCount); float deltaRadius = searchRadius / float(stepCount);
vec2 tapPixelPos = vec2(0); vec2 tapPixelOffset = vec2(0);
#if SSAO_LINEAR_SAMPLING #if SSAO_LINEAR_SEARCH_HORIZON
float radius = 0.0; float radius = 0.0;
int stepIndex; int stepIndex;
for (stepIndex=0 ; stepIndex<stepCount ; stepIndex++) { for (stepIndex=0 ; stepIndex<stepCount ; stepIndex++) {
tapPixelPos += deltaPixelTap; tapPixelOffset += deltaPixelTap;
radius += deltaRadius; radius += deltaRadius;
<$computeHorizon()$> <$computeHorizon()$>
@ -366,8 +340,8 @@ float computeHorizon(ivec4 side, ivec2 shadedPixelPos, vec2 sideImageSize, vec2
float radius = deltaRadius; float radius = deltaRadius;
float mipLevel = evalMipFromRadius(radius * float(doFetchMips())); float mipLevel = evalMipFromRadius(radius * float(doFetchMips()));
while (radius<searchRadius) { while (radius<=searchRadius) {
tapPixelPos += deltaPixelTap; tapPixelOffset += deltaPixelTap;
<$computeHorizon()$> <$computeHorizon()$>
@ -384,16 +358,16 @@ float computeHorizon(ivec4 side, ivec2 shadedPixelPos, vec2 sideImageSize, vec2
return cosHorizonAngle; return cosHorizonAngle;
} }
float evalVisibilityHBAO(ivec4 side, ivec2 shadedPixelPos, vec2 sideImageSize, vec2 deltaTap, float diskPixelRadius, float evalVisibilityHBAO(ivec4 side, vec2 shadedPixelPos, vec2 sideImageSize, vec2 deltaTap, float diskPixelRadius,
vec3 fragPositionES, vec3 fragNormalES) { vec3 fragPositionES, vec3 fragNormalES) {
vec2 searchVec = deltaTap * diskPixelRadius; vec2 searchVec = deltaTap * diskPixelRadius;
float obscurance; float obscurance;
// Forward search for h1 // Forward search for h1
obscurance = computeHorizon(side, shadedPixelPos, sideImageSize, deltaTap, fragPositionES, fragNormalES, searchVec); obscurance = computeHorizon(side, shadedPixelPos, sideImageSize, deltaTap, fragPositionES, fragNormalES, searchVec, diskPixelRadius);
// Backward search for h2 // Backward search for h2
obscurance += computeHorizon(side, shadedPixelPos, sideImageSize, deltaTap, fragPositionES, fragNormalES, -searchVec); obscurance += computeHorizon(side, shadedPixelPos, sideImageSize, deltaTap, fragPositionES, fragNormalES, -searchVec, diskPixelRadius);
return obscurance * 0.5 / PI; return obscurance * 0.5 / PI;
} }

7
libraries/render-utils/src/ssao_makeOcclusion.slf
View file

@ -60,10 +60,13 @@ void main(void) {
for (int i = 0; i < numSamples; ++i) { for (int i = 0; i < numSamples; ++i) {
#if SSAO_USE_HORIZON_BASED #if SSAO_USE_HORIZON_BASED
vec3 deltaTap = getUnitTapLocation(i, 1.0, randomPatternRotationAngle, PI); vec3 deltaTap = getUnitTapLocation(i, 1.0, randomPatternRotationAngle, PI);
obscuranceSum += evalVisibilityHBAO(side, shadedPixelPos, sideImageSize, deltaTap.xy, diskPixelRadius, fragPositionES, fragNormalES); // TEMPO OP
deltaTap.xy = vec2(1,0);
obscuranceSum += evalVisibilityHBAO(side, vec2(shadedPixelPos), sideImageSize, deltaTap.xy, diskPixelRadius, fragPositionES, fragNormalES);
#else #else
vec3 tap = getTapLocationClampedSSAO(i, randomPatternRotationAngle, diskPixelRadius, shadedPixelPos, sideImageSize); vec3 tap = getTapLocationClampedSSAO(i, randomPatternRotationAngle, diskPixelRadius, shadedPixelPos, sideImageSize);
vec3 tapUVZ = fetchTap(side, shadedPixelPos, tap, sideImageSize); vec2 tapPixelPos = vec2(shadedPixelPos) + tap.xy;
vec3 tapUVZ = fetchTap(side, tapPixelPos, tap.z, sideImageSize);
vec3 tapPositionES = evalEyePositionFromZeye(side.x, tapUVZ.z, tapUVZ.xy); vec3 tapPositionES = evalEyePositionFromZeye(side.x, tapUVZ.z, tapUVZ.xy);
obscuranceSum += float(tap.z > 0.0) * evalVisibilitySSAO(fragPositionES, fragNormalES, tapPositionES); obscuranceSum += float(tap.z > 0.0) * evalVisibilitySSAO(fragPositionES, fragNormalES, tapPositionES);
#endif #endif

13
libraries/render-utils/src/mip_depth_median.slf → libraries/render-utils/src/ssao_mip_depth.slf
View file

@ -2,7 +2,7 @@
<$VERSION_HEADER$> <$VERSION_HEADER$>
// Generated on <$_SCRIBE_DATE$> // Generated on <$_SCRIBE_DATE$>
// //
// mip_depth_median.frag // ssao_mip_depth.frag
// fragment shader // fragment shader
// //
// Created by Olivier Prat on 4/18/18. // Created by Olivier Prat on 4/18/18.
@ -22,7 +22,7 @@ void main(void) {
vec4 depths = textureGather(depthTexture, varTexCoord0); vec4 depths = textureGather(depthTexture, varTexCoord0);
// Order the depths from minimum to maximum // Order the depths from minimum to maximum
depths.xy = depths.x > depths.y ? depths.yx : depths.xy; /* depths.xy = depths.x > depths.y ? depths.yx : depths.xy;
depths.xz = depths.x > depths.z ? depths.zx : depths.xz; depths.xz = depths.x > depths.z ? depths.zx : depths.xz;
depths.xw = depths.x > depths.w ? depths.wx : depths.xw; depths.xw = depths.x > depths.w ? depths.wx : depths.xw;
@ -31,6 +31,11 @@ void main(void) {
depths.zw = depths.z > depths.w ? depths.wz : depths.zw; depths.zw = depths.z > depths.w ? depths.wz : depths.zw;
float median = (depths.y + depths.z) / 2.0; float outZ = (depths.y + depths.z) / 2.0;*/
outFragColor = vec4(vec3(median), 1.0);
float outZ = min(depths.x, depths.y);
outZ = min(outZ, depths.z);
outZ = min(outZ, depths.w);
outFragColor = vec4(vec3(outZ), 1.0);
} }

8
scripts/developer/utilities/render/luci.js
View file

@ -78,13 +78,11 @@
Controller.mouseReleaseEvent.connect(function() { moveDebugCursor = false; }); Controller.mouseReleaseEvent.connect(function() { moveDebugCursor = false; });
Controller.mouseMoveEvent.connect(function (e) { if (moveDebugCursor) setDebugCursor(e.x, e.y); }); Controller.mouseMoveEvent.connect(function (e) { if (moveDebugCursor) setDebugCursor(e.x, e.y); });
function setDebugCursor(x, y) { function setDebugCursor(x, y) {
nx = (x / Window.innerWidth); nx = ((x + 0.5) / Window.innerWidth);
ny = 1.0 - ((y) / (Window.innerHeight - 32)); ny = 1.0 - ((y + 0.5) / (Window.innerHeight));
Render.getConfig("RenderMainView").getConfig("Antialiasing").debugCursorTexcoord = { x: nx, y: ny }; Render.getConfig("RenderMainView").getConfig("DebugDeferredBuffer").debugCursorTexcoord = { x: nx, y: ny };
} }