From f2119b1d0b57dcefe5e32e9e204821cd98e9ca02 Mon Sep 17 00:00:00 2001 From: Alexander Rose <alexander.rose@weirdbyte.de> Date: Sun, 19 Dec 2021 13:05:34 -0800 Subject: [PATCH] tweak alpha-orbitals example - remove direct-volume option - enable tryUseGpu for isosurface repr --- src/examples/alpha-orbitals/index.ts | 3 +-- src/extensions/alpha-orbitals/transforms.ts | 15 +-------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/examples/alpha-orbitals/index.ts b/src/examples/alpha-orbitals/index.ts index 4ce65c3ae..97ed7d3ce 100644 --- a/src/examples/alpha-orbitals/index.ts +++ b/src/examples/alpha-orbitals/index.ts @@ -170,12 +170,11 @@ export class AlphaOrbitalsExample { return { alpha: 0.85, color, - directVolume: this.state.value.gpuSurface, kind, relativeIsovalue: this.state.value.isoValue, pickable: false, xrayShaded: true, - tryUseGpu: false + tryUseGpu: true }; } diff --git a/src/extensions/alpha-orbitals/transforms.ts b/src/extensions/alpha-orbitals/transforms.ts index 724f3f416..d9d2ebd36 100644 --- a/src/extensions/alpha-orbitals/transforms.ts +++ b/src/extensions/alpha-orbitals/transforms.ts @@ -166,7 +166,6 @@ export const CreateOrbitalRepresentation3D = PluginStateTransform.BuiltIn({ from: PluginStateObject.Volume.Data, to: PluginStateObject.Volume.Representation3D, params: { - directVolume: PD.Boolean(false), relativeIsovalue: PD.Numeric(1, { min: 0.01, max: 5, step: 0.01 }), kind: PD.Select<'positive' | 'negative'>('positive', [['positive', 'Positive'], ['negative', 'Negative']]), color: PD.Color(ColorNames.blue), @@ -217,19 +216,7 @@ function volumeParams(plugin: PluginContext, volume: PluginStateObject.Volume.Da const value = isovalues[params.kind]; - return createVolumeRepresentationParams(plugin, volume.data, params.directVolume ? { - type: 'direct-volume', - typeParams: { - alpha: params.alpha, - renderMode: { - name: 'isosurface', - params: { isoValue: { kind: 'absolute', absoluteValue: (value ?? 1000) * params.relativeIsovalue }, singleLayer: false } - }, - xrayShaded: params.xrayShaded - }, - color: 'uniform', - colorParams: { value: params.color } - } : { + return createVolumeRepresentationParams(plugin, volume.data, { type: 'isosurface', typeParams: { isoValue: { kind: 'absolute', absoluteValue: (value ?? 1000) * params.relativeIsovalue }, alpha: params.alpha, xrayShaded: params.xrayShaded, tryUseGpu: params.tryUseGpu }, color: 'uniform', -- GitLab