From ced7d3bef4a15bef51fbaae156d032f6e7542cce Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Mon, 22 Oct 2018 14:49:37 -0700
Subject: [PATCH] volume render tweaks
---
src/apps/canvas/structure-view.ts | 2 +-
src/mol-geo/geometry/direct-volume/direct-volume.ts | 2 +-
src/mol-gl/renderable/direct-volume.ts | 2 +-
src/mol-gl/shader/gaussian-density.frag | 2 +-
src/mol-math/geometry/gaussian-density/gpu.ts | 1 -
5 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/apps/canvas/structure-view.ts b/src/apps/canvas/structure-view.ts
index dce28b086..3b4658514 100644
--- a/src/apps/canvas/structure-view.ts
+++ b/src/apps/canvas/structure-view.ts
@@ -70,7 +70,7 @@ export async function StructureView(app: App, viewer: Viewer, models: ReadonlyAr
const active: { [k: string]: boolean } = {
cartoon: true,
point: false,
- surface: false,
+ surface: true,
ballAndStick: false,
carbohydrate: false,
spacefill: false,
diff --git a/src/mol-geo/geometry/direct-volume/direct-volume.ts b/src/mol-geo/geometry/direct-volume/direct-volume.ts
index 5d175ea1f..3d5379279 100644
--- a/src/mol-geo/geometry/direct-volume/direct-volume.ts
+++ b/src/mol-geo/geometry/direct-volume/direct-volume.ts
@@ -37,7 +37,7 @@ const BaseParams = {
...Geometry.Params,
isoValueAbsolute: RangeParam('Iso Value Absolute', '', 0.22, -1, 1, 0.01),
isoValueRelative: RangeParam('Iso Value Relative', '', 2, -10, 10, 0.1),
- renderMode: SelectParam('Render Mode', '', 'volume', RenderModeOptions),
+ renderMode: SelectParam('Render Mode', '', 'isosurface', RenderModeOptions),
controlPoints: TextParam('Control Points', '', '0.19:0.1, 0.2:0.5, 0.21:0.1, 0.4:0.3'),
}
const DefaultBaseProps = paramDefaultValues(BaseParams)
diff --git a/src/mol-gl/renderable/direct-volume.ts b/src/mol-gl/renderable/direct-volume.ts
index b29b924cf..2f043942b 100644
--- a/src/mol-gl/renderable/direct-volume.ts
+++ b/src/mol-gl/renderable/direct-volume.ts
@@ -63,7 +63,7 @@ function DirectVolumeRenderable<T extends DirectVolumeBaseValues, S extends Dire
const renderItem = createRenderItem(ctx, 'triangles', shaderCode, fullSchema, fullValues)
const renderable = createRenderable(renderItem, values, state);
- Object.defineProperty(renderable, 'opaque', { get: () => true });
+ Object.defineProperty(renderable, 'opaque', { get: () => false });
return renderable
}
diff --git a/src/mol-gl/shader/gaussian-density.frag b/src/mol-gl/shader/gaussian-density.frag
index 827b66297..0f6dfe324 100644
--- a/src/mol-gl/shader/gaussian-density.frag
+++ b/src/mol-gl/shader/gaussian-density.frag
@@ -66,7 +66,7 @@ void main() {
float minDistance = decodeDistLog(1.0 - textureMinDist(fragPos).a);
// TODO verify `length(uBboxSize / uGridDim) * 2.0`
// on some machines `* 2.0` is needed while on others `* 0.5` works
- if (dist > minDistance + length(uBboxSize / uGridDim) * 2.0)
+ if (dist > minDistance + length(uBboxSize / uGridDim) * 0.5)
discard;
gl_FragColor.rgb = encodeIdRGB(vGroup);
#endif
diff --git a/src/mol-math/geometry/gaussian-density/gpu.ts b/src/mol-math/geometry/gaussian-density/gpu.ts
index 682699cb2..62f9a56d2 100644
--- a/src/mol-math/geometry/gaussian-density/gpu.ts
+++ b/src/mol-math/geometry/gaussian-density/gpu.ts
@@ -33,7 +33,6 @@ export async function GaussianDensityGPU(ctx: RuntimeContext, position: Position
const transform = Mat4.identity()
Mat4.fromScaling(transform, scale)
Mat4.setTranslation(transform, bbox.min)
- console.log(idField)
return { field, idField, transform }
}
--
GitLab