diff --git a/src/apps/docking-viewer/viewport.tsx b/src/apps/docking-viewer/viewport.tsx index 0e7e5efb92edda89d9ac75ecd1ccef1d92e35c40..b988b49e3e3dcf1ae7c89fec944e04bd445dfcfa 100644 --- a/src/apps/docking-viewer/viewport.tsx +++ b/src/apps/docking-viewer/viewport.tsx @@ -48,7 +48,7 @@ function occlusionStyle(plugin: PluginContext) { blurKernelSize: 15, radius: 5, samples: 32, - scaleFactor: 0.5 + scaleFactor: 1 } }, outline: { name: 'on', params: { scale: 1.0, diff --git a/src/examples/lighting/index.ts b/src/examples/lighting/index.ts index 3b67fcf19aee5e7238b061ad90a6189746138cbf..97b2db364e45c6e590f48684f7749207bc674057 100644 --- a/src/examples/lighting/index.ts +++ b/src/examples/lighting/index.ts @@ -24,7 +24,7 @@ const Canvas3DPresets = { illustrative: { canvas3d: <Preset>{ postprocessing: { - occlusion: { name: 'on', params: { samples: 32, radius: 6, bias: 1.4, blurKernelSize: 15, scaleFactor: 0.5 } }, + occlusion: { name: 'on', params: { samples: 32, radius: 6, bias: 1.4, blurKernelSize: 15, scaleFactor: 1 } }, outline: { name: 'on', params: { scale: 1, threshold: 0.33, color: Color(0x000000) } } }, renderer: { @@ -36,7 +36,7 @@ const Canvas3DPresets = { occlusion: { canvas3d: <Preset>{ postprocessing: { - occlusion: { name: 'on', params: { samples: 32, radius: 6, bias: 1.4, blurKernelSize: 15, scaleFactor: 0.5 } }, + occlusion: { name: 'on', params: { samples: 32, radius: 6, bias: 1.4, blurKernelSize: 15, scaleFactor: 1 } }, outline: { name: 'off', params: {} } }, renderer: { diff --git a/src/mol-canvas3d/passes/postprocessing.ts b/src/mol-canvas3d/passes/postprocessing.ts index 27af63107d6382cfcb74e5bf10a704764018d773..2b81018aa0fd8d08d647577a64024c705f368ebe 100644 --- a/src/mol-canvas3d/passes/postprocessing.ts +++ b/src/mol-canvas3d/passes/postprocessing.ts @@ -249,7 +249,7 @@ export const PostprocessingParams = { radius: PD.Numeric(5, { min: 0, max: 10, step: 0.1 }, { description: 'Final occlusion radius is 2^x' }), bias: PD.Numeric(0.8, { min: 0, max: 3, step: 0.1 }), blurKernelSize: PD.Numeric(15, { min: 1, max: 25, step: 2 }), - scaleFactor: PD.Numeric(0.5, { min: 0.1, max: 1, step: 0.05 }, { description: 'Adjust resolution of occlusion calculation' }), + scaleFactor: PD.Numeric(1, { min: 0.1, max: 1, step: 0.05 }, { description: 'Adjust resolution of occlusion calculation' }), }), off: PD.Group({}) }, { cycle: true, description: 'Darken occluded crevices with the ambient occlusion effect' }), @@ -313,7 +313,7 @@ export class PostprocessingPass { this.nSamples = 1; this.blurKernelSize = 1; - this.downsampleFactor = 0.5; + this.downsampleFactor = 1; this.ssaoScale = this.calcSsaoScale(); // needs to be linear for anti-aliasing pass @@ -352,7 +352,7 @@ export class PostprocessingPass { this.ssaoDepthTexture.attachFramebuffer(this.ssaoBlurSecondPassFramebuffer, 'color0'); - this.ssaoRenderable = getSsaoRenderable(webgl, this.downsampledDepthTarget.texture); + this.ssaoRenderable = getSsaoRenderable(webgl, this.downsampleFactor === 1 ? depthTexture : this.downsampledDepthTarget.texture); this.ssaoBlurFirstPassRenderable = getSsaoBlurRenderable(webgl, this.ssaoDepthTexture, 'horizontal'); this.ssaoBlurSecondPassRenderable = getSsaoBlurRenderable(webgl, this.ssaoDepthBlurProxyTexture, 'vertical'); this.renderable = getPostprocessingRenderable(webgl, colorTarget.texture, depthTexture, this.outlinesTarget.texture, this.ssaoDepthTexture); @@ -530,7 +530,7 @@ export class PostprocessingPass { gl.scissor(x, y, width, height); } - occlusionOffset: [x: number, y: number] = [0, 0]; + private occlusionOffset: [x: number, y: number] = [0, 0]; setOcclusionOffset(x: number, y: number) { this.occlusionOffset[0] = x; this.occlusionOffset[1] = y; diff --git a/src/mol-plugin-ui/structure/quick-styles.tsx b/src/mol-plugin-ui/structure/quick-styles.tsx index 9d0aa9e1023ad4eeaeb3666fe31d0674e423a30d..1449eea3e44c7cabb63573643aa8bcbbb2d1eba0 100644 --- a/src/mol-plugin-ui/structure/quick-styles.tsx +++ b/src/mol-plugin-ui/structure/quick-styles.tsx @@ -60,7 +60,7 @@ export class QuickStyles extends PurePluginUIComponent { }, occlusion: { name: 'on', - params: { bias: 0.8, blurKernelSize: 15, radius: 5, samples: 32, scaleFactor: 0.5 } + params: { bias: 0.8, blurKernelSize: 15, radius: 5, samples: 32, scaleFactor: 1 } }, } }); @@ -84,7 +84,7 @@ export class QuickStyles extends PurePluginUIComponent { name: 'on', params: pp.occlusion.name === 'on' ? pp.occlusion.params - : { bias: 0.8, blurKernelSize: 15, radius: 5, samples: 32, scaleFactor: 0.5 } + : { bias: 0.8, blurKernelSize: 15, radius: 5, samples: 32, scaleFactor: 1 } }, } }); diff --git a/src/mol-plugin/util/viewport-screenshot.ts b/src/mol-plugin/util/viewport-screenshot.ts index 644afa43951abdc2dd897fdbafd6ecc46770cf93..722c605fdf5cd2fb93fe790fefe0e2d2721b887c 100644 --- a/src/mol-plugin/util/viewport-screenshot.ts +++ b/src/mol-plugin/util/viewport-screenshot.ts @@ -143,7 +143,7 @@ class ViewportScreenshotHelper extends PluginComponent { postprocessing: { ...c.props.postprocessing, occlusion: aoProps.name === 'on' - ? { name: 'on', params: { ...aoProps.params, samples: 128 } } + ? { name: 'on', params: { ...aoProps.params, samples: 128, scaleFactor: 1 } } : aoProps }, marking: { ...c.props.marking }