molstar 3.26.0 → 3.28.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +20 -20
- package/README.md +202 -202
- package/build/viewer/embedded.html +52 -52
- package/build/viewer/index.html +115 -115
- package/build/viewer/molstar.css +1 -1
- package/build/viewer/molstar.js +1 -1
- package/lib/apps/docking-viewer/index.html +36 -36
- package/lib/apps/docking-viewer/viewport.d.ts +2 -0
- package/lib/apps/docking-viewer/viewport.js +1 -0
- package/lib/apps/viewer/app.d.ts +3 -1
- package/lib/apps/viewer/app.js +4 -0
- package/lib/apps/viewer/embedded.html +52 -52
- package/lib/apps/viewer/index.html +115 -115
- package/lib/cli/structure-info/volume.js +1 -1
- package/lib/commonjs/apps/docking-viewer/viewport.d.ts +2 -0
- package/lib/commonjs/apps/docking-viewer/viewport.js +1 -0
- package/lib/commonjs/apps/viewer/app.d.ts +3 -1
- package/lib/commonjs/apps/viewer/app.js +4 -0
- package/lib/commonjs/cli/structure-info/volume.js +1 -1
- package/lib/commonjs/examples/lighting/index.js +1 -1
- package/lib/commonjs/extensions/anvil/behavior.d.ts +1 -0
- package/lib/commonjs/extensions/cellpack/model.js +2 -1
- package/lib/commonjs/extensions/dnatco/confal-pyramids/behavior.d.ts +1 -0
- package/lib/commonjs/extensions/meshes/choice.d.ts +26 -0
- package/lib/commonjs/extensions/meshes/choice.js +31 -0
- package/lib/commonjs/extensions/meshes/examples.d.ts +26 -0
- package/lib/commonjs/extensions/meshes/examples.js +337 -0
- package/lib/commonjs/extensions/meshes/mesh-cif-schema.d.ts +29 -0
- package/lib/commonjs/extensions/meshes/mesh-cif-schema.js +34 -0
- package/lib/commonjs/extensions/meshes/mesh-extension.d.ts +66 -0
- package/lib/commonjs/extensions/meshes/mesh-extension.js +221 -0
- package/lib/commonjs/extensions/meshes/mesh-streaming/behavior.d.ts +105 -0
- package/lib/commonjs/extensions/meshes/mesh-streaming/behavior.js +379 -0
- package/lib/commonjs/extensions/meshes/mesh-streaming/server-info.d.ts +54 -0
- package/lib/commonjs/extensions/meshes/mesh-streaming/server-info.js +30 -0
- package/lib/commonjs/extensions/meshes/mesh-streaming/transformers.d.ts +42 -0
- package/lib/commonjs/extensions/meshes/mesh-streaming/transformers.js +273 -0
- package/lib/commonjs/extensions/meshes/mesh-utils.d.ts +41 -0
- package/lib/commonjs/extensions/meshes/mesh-utils.js +357 -0
- package/lib/commonjs/extensions/meshes/metadata.d.ts +108 -0
- package/lib/commonjs/extensions/meshes/metadata.js +72 -0
- package/lib/commonjs/extensions/model-archive/quality-assessment/behavior.d.ts +2 -0
- package/lib/commonjs/extensions/model-archive/quality-assessment/prop.d.ts +1 -0
- package/lib/commonjs/extensions/model-archive/quality-assessment/prop.js +16 -4
- package/lib/commonjs/extensions/rcsb/assembly-symmetry/behavior.d.ts +4 -2
- package/lib/commonjs/extensions/rcsb/validation-report/behavior.d.ts +3 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/entry-meshes.d.ts +17 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/entry-meshes.js +156 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/entry-models.d.ts +12 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/entry-models.js +96 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/entry-root.d.ts +122 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/entry-root.js +576 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/entry-segmentation.d.ts +20 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/entry-segmentation.js +200 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/entry-state.d.ts +88 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/entry-state.js +32 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/entry-volume.d.ts +35 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/entry-volume.js +234 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/external-api.d.ts +11 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/external-api.js +85 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/global-state.d.ts +51 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/global-state.js +83 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/helpers.d.ts +56 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/helpers.js +171 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/index.d.ts +20 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/index.js +130 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/transformers.d.ts +33 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/transformers.js +85 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/ui.d.ts +29 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/ui.js +232 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/volseg-api/api.d.ts +22 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/volseg-api/api.js +83 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/volseg-api/data.d.ts +92 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/volseg-api/data.js +7 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/volseg-api/utils.d.ts +23 -0
- package/lib/commonjs/extensions/volumes-and-segmentations/volseg-api/utils.js +78 -0
- package/lib/commonjs/mol-canvas3d/canvas3d.d.ts +2 -0
- package/lib/commonjs/mol-canvas3d/passes/draw.js +3 -3
- package/lib/commonjs/mol-canvas3d/passes/image.d.ts +1 -0
- package/lib/commonjs/mol-canvas3d/passes/postprocessing.d.ts +2 -1
- package/lib/commonjs/mol-canvas3d/passes/postprocessing.js +27 -13
- package/lib/commonjs/mol-geo/geometry/cylinders/cylinders.d.ts +2 -1
- package/lib/commonjs/mol-geo/geometry/cylinders/cylinders.js +3 -2
- package/lib/commonjs/mol-geo/geometry/lines/lines.d.ts +0 -1
- package/lib/commonjs/mol-geo/geometry/points/points.d.ts +1 -1
- package/lib/commonjs/mol-geo/geometry/spheres/spheres.d.ts +1 -0
- package/lib/commonjs/mol-geo/geometry/spheres/spheres.js +3 -2
- package/lib/commonjs/mol-gl/compute/histogram-pyramid/reduction.js +1 -2
- package/lib/commonjs/mol-gl/compute/marching-cubes/isosurface.js +4 -6
- package/lib/commonjs/mol-gl/renderable/cylinders.d.ts +1 -0
- package/lib/commonjs/mol-gl/renderable/cylinders.js +1 -1
- package/lib/commonjs/mol-gl/renderable/spheres.d.ts +1 -0
- package/lib/commonjs/mol-gl/renderable/spheres.js +1 -1
- package/lib/commonjs/mol-gl/shader/chunks/apply-light-color.glsl.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader/chunks/apply-light-color.glsl.js +1 -1
- package/lib/commonjs/mol-gl/shader/chunks/clip-instance.glsl.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader/chunks/clip-instance.glsl.js +1 -1
- package/lib/commonjs/mol-gl/shader/chunks/clip-pixel.glsl.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader/chunks/clip-pixel.glsl.js +1 -1
- package/lib/commonjs/mol-gl/shader/chunks/common-clip.glsl.d.ts +2 -2
- package/lib/commonjs/mol-gl/shader/chunks/common-clip.glsl.js +2 -2
- package/lib/commonjs/mol-gl/shader/cylinders.frag.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader/cylinders.frag.js +1 -1
- package/lib/commonjs/mol-gl/shader/cylinders.vert.d.ts +2 -2
- package/lib/commonjs/mol-gl/shader/cylinders.vert.js +2 -2
- package/lib/commonjs/mol-gl/shader/direct-volume.frag.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader/direct-volume.frag.js +1 -1
- package/lib/commonjs/mol-gl/shader/outlines.frag.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader/outlines.frag.js +1 -1
- package/lib/commonjs/mol-gl/shader/postprocessing.frag.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader/postprocessing.frag.js +1 -1
- package/lib/commonjs/mol-gl/shader/spheres.frag.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader/spheres.frag.js +1 -1
- package/lib/commonjs/mol-gl/shader/spheres.vert.d.ts +2 -2
- package/lib/commonjs/mol-gl/shader/spheres.vert.js +2 -2
- package/lib/commonjs/mol-gl/webgl/renderbuffer.d.ts +1 -1
- package/lib/commonjs/mol-gl/webgl/renderbuffer.js +15 -0
- package/lib/commonjs/mol-gl/webgl/state.d.ts +12 -0
- package/lib/commonjs/mol-gl/webgl/state.js +136 -0
- package/lib/commonjs/mol-io/reader/cif/schema/segmentation.d.ts +38 -0
- package/lib/commonjs/mol-io/reader/cif/schema/segmentation.js +22 -0
- package/lib/commonjs/mol-io/reader/cif.d.ts +3 -1
- package/lib/commonjs/mol-io/reader/cif.js +3 -1
- package/lib/commonjs/mol-model/location.d.ts +2 -1
- package/lib/commonjs/mol-model/loci.d.ts +11 -11
- package/lib/commonjs/mol-model/loci.js +13 -1
- package/lib/commonjs/mol-model/sequence/alignment/sequence.d.ts +4 -1
- package/lib/commonjs/mol-model/sequence/alignment/sequence.js +4 -1
- package/lib/commonjs/mol-model/structure/model/properties/atomic/hierarchy.d.ts +6 -0
- package/lib/commonjs/mol-model/structure/model/properties/utils/atomic-index.js +8 -0
- package/lib/commonjs/mol-model/structure/structure/unit/bonds/inter-compute.js +21 -5
- package/lib/commonjs/mol-model/structure/structure/util/superposition.d.ts +1 -0
- package/lib/commonjs/mol-model/structure/structure/util/superposition.js +2 -1
- package/lib/commonjs/mol-model/volume/volume.d.ts +35 -2
- package/lib/commonjs/mol-model/volume/volume.js +77 -2
- package/lib/commonjs/mol-model-formats/volume/segmentation.d.ts +23 -0
- package/lib/commonjs/mol-model-formats/volume/segmentation.js +138 -0
- package/lib/commonjs/mol-plugin/behavior/dynamic/representation.d.ts +2 -2
- package/lib/commonjs/mol-plugin/behavior/dynamic/selection/structure-focus-representation.d.ts +1 -0
- package/lib/commonjs/mol-plugin/behavior/dynamic/selection/structure-focus-representation.js +2 -1
- package/lib/commonjs/mol-plugin/behavior/dynamic/volume-streaming/model.d.ts +2 -3
- package/lib/commonjs/mol-plugin/commands.d.ts +1 -0
- package/lib/commonjs/mol-plugin-state/animation/built-in/model-index.js +4 -1
- package/lib/commonjs/mol-plugin-state/builder/structure/hierarchy-preset.d.ts +2 -0
- package/lib/commonjs/mol-plugin-state/builder/structure/hierarchy.d.ts +1 -0
- package/lib/commonjs/mol-plugin-state/builder/structure/representation-preset.d.ts +13 -4
- package/lib/commonjs/mol-plugin-state/builder/structure/representation-preset.js +6 -1
- package/lib/commonjs/mol-plugin-state/builder/structure/representation.d.ts +1 -0
- package/lib/commonjs/mol-plugin-state/formats/provider.d.ts +2 -2
- package/lib/commonjs/mol-plugin-state/formats/provider.js +11 -3
- package/lib/commonjs/mol-plugin-state/formats/registry.js +6 -5
- package/lib/commonjs/mol-plugin-state/formats/volume.d.ts +27 -0
- package/lib/commonjs/mol-plugin-state/formats/volume.js +65 -1
- package/lib/commonjs/mol-plugin-state/manager/structure/component.d.ts +1 -1
- package/lib/commonjs/mol-plugin-state/manager/structure/component.js +18 -13
- package/lib/commonjs/mol-plugin-state/transforms/representation.d.ts +1 -2
- package/lib/commonjs/mol-plugin-state/transforms/representation.js +5 -6
- package/lib/commonjs/mol-plugin-state/transforms/volume.d.ts +11 -1
- package/lib/commonjs/mol-plugin-state/transforms/volume.js +55 -2
- package/lib/commonjs/mol-plugin-ui/controls/line-graph/line-graph-component.d.ts +1 -0
- package/lib/commonjs/mol-plugin-ui/controls/line-graph/line-graph-component.js +33 -13
- package/lib/commonjs/mol-plugin-ui/controls/parameters.d.ts +1 -0
- package/lib/commonjs/mol-plugin-ui/controls/parameters.js +22 -5
- package/lib/commonjs/mol-plugin-ui/sequence/sequence.d.ts +25 -17
- package/lib/commonjs/mol-plugin-ui/sequence.d.ts +19 -1
- package/lib/commonjs/mol-plugin-ui/sequence.js +8 -1
- package/lib/commonjs/mol-plugin-ui/state/apply-action.d.ts +2 -10
- package/lib/commonjs/mol-plugin-ui/state/apply-action.js +2 -2
- package/lib/commonjs/mol-plugin-ui/structure/quick-styles.js +2 -2
- package/lib/commonjs/mol-plugin-ui/structure/superposition.d.ts +1 -1
- package/lib/commonjs/mol-plugin-ui/structure/volume.d.ts +1 -1
- package/lib/commonjs/mol-plugin-ui/structure/volume.js +3 -2
- package/lib/commonjs/mol-repr/structure/complex-visual.d.ts +1 -0
- package/lib/commonjs/mol-repr/structure/params.d.ts +2 -0
- package/lib/commonjs/mol-repr/structure/registry.d.ts +12 -0
- package/lib/commonjs/mol-repr/structure/representation/backbone.d.ts +3 -0
- package/lib/commonjs/mol-repr/structure/representation/ball-and-stick.d.ts +6 -0
- package/lib/commonjs/mol-repr/structure/representation/ellipsoid.d.ts +6 -0
- package/lib/commonjs/mol-repr/structure/representation/gaussian-surface.d.ts +3 -0
- package/lib/commonjs/mol-repr/structure/representation/gaussian-volume.d.ts +3 -0
- package/lib/commonjs/mol-repr/structure/representation/line.d.ts +3 -0
- package/lib/commonjs/mol-repr/structure/representation/molecular-surface.d.ts +3 -0
- package/lib/commonjs/mol-repr/structure/representation/point.d.ts +3 -0
- package/lib/commonjs/mol-repr/structure/representation/spacefill.d.ts +6 -0
- package/lib/commonjs/mol-repr/structure/units-visual.d.ts +2 -0
- package/lib/commonjs/mol-repr/structure/visual/bond-inter-unit-cylinder.d.ts +4 -0
- package/lib/commonjs/mol-repr/structure/visual/bond-inter-unit-cylinder.js +2 -0
- package/lib/commonjs/mol-repr/structure/visual/bond-inter-unit-line.d.ts +1 -0
- package/lib/commonjs/mol-repr/structure/visual/bond-inter-unit-line.js +1 -0
- package/lib/commonjs/mol-repr/structure/visual/bond-intra-unit-cylinder.d.ts +4 -0
- package/lib/commonjs/mol-repr/structure/visual/bond-intra-unit-cylinder.js +2 -0
- package/lib/commonjs/mol-repr/structure/visual/bond-intra-unit-line.d.ts +1 -0
- package/lib/commonjs/mol-repr/structure/visual/bond-intra-unit-line.js +1 -0
- package/lib/commonjs/mol-repr/structure/visual/element-cross.d.ts +1 -0
- package/lib/commonjs/mol-repr/structure/visual/element-cross.js +2 -1
- package/lib/commonjs/mol-repr/structure/visual/element-point.d.ts +1 -0
- package/lib/commonjs/mol-repr/structure/visual/element-point.js +2 -1
- package/lib/commonjs/mol-repr/structure/visual/element-sphere.d.ts +4 -0
- package/lib/commonjs/mol-repr/structure/visual/element-sphere.js +3 -1
- package/lib/commonjs/mol-repr/structure/visual/gaussian-density-volume.d.ts +2 -0
- package/lib/commonjs/mol-repr/structure/visual/gaussian-density-volume.js +6 -2
- package/lib/commonjs/mol-repr/structure/visual/gaussian-surface-mesh.d.ts +4 -0
- package/lib/commonjs/mol-repr/structure/visual/gaussian-surface-mesh.js +9 -1
- package/lib/commonjs/mol-repr/structure/visual/gaussian-surface-wireframe.d.ts +1 -0
- package/lib/commonjs/mol-repr/structure/visual/gaussian-surface-wireframe.js +3 -1
- package/lib/commonjs/mol-repr/structure/visual/molecular-surface-mesh.d.ts +1 -0
- package/lib/commonjs/mol-repr/structure/visual/molecular-surface-mesh.js +4 -0
- package/lib/commonjs/mol-repr/structure/visual/molecular-surface-wireframe.d.ts +1 -0
- package/lib/commonjs/mol-repr/structure/visual/molecular-surface-wireframe.js +2 -0
- package/lib/commonjs/mol-repr/structure/visual/polymer-backbone-cylinder.d.ts +2 -0
- package/lib/commonjs/mol-repr/structure/visual/polymer-backbone-sphere.d.ts +2 -0
- package/lib/commonjs/mol-repr/structure/visual/util/bond.d.ts +7 -0
- package/lib/commonjs/mol-repr/structure/visual/util/bond.js +18 -7
- package/lib/commonjs/mol-repr/structure/visual/util/common.d.ts +4 -1
- package/lib/commonjs/mol-repr/structure/visual/util/common.js +10 -6
- package/lib/commonjs/mol-repr/structure/visual/util/element.d.ts +1 -0
- package/lib/commonjs/mol-repr/structure/visual/util/element.js +2 -3
- package/lib/commonjs/mol-repr/structure/visual/util/gaussian.d.ts +2 -0
- package/lib/commonjs/mol-repr/volume/direct-volume.d.ts +4 -4
- package/lib/commonjs/mol-repr/volume/direct-volume.js +8 -6
- package/lib/commonjs/mol-repr/volume/isosurface.d.ts +4 -4
- package/lib/commonjs/mol-repr/volume/isosurface.js +17 -16
- package/lib/commonjs/mol-repr/volume/registry.d.ts +54 -1
- package/lib/commonjs/mol-repr/volume/registry.js +3 -1
- package/lib/commonjs/mol-repr/volume/representation.d.ts +11 -7
- package/lib/commonjs/mol-repr/volume/representation.js +142 -47
- package/lib/commonjs/mol-repr/volume/segment.d.ts +291 -0
- package/lib/commonjs/mol-repr/volume/segment.js +289 -0
- package/lib/commonjs/mol-repr/volume/slice.d.ts +2 -2
- package/lib/commonjs/mol-repr/volume/slice.js +5 -5
- package/lib/commonjs/mol-repr/volume/util.d.ts +12 -3
- package/lib/commonjs/mol-repr/volume/util.js +72 -6
- package/lib/commonjs/mol-script/language/builder.d.ts +1 -0
- package/lib/commonjs/mol-theme/color/volume-segment.d.ts +41 -0
- package/lib/commonjs/mol-theme/color/volume-segment.js +58 -0
- package/lib/commonjs/mol-theme/color/volume-value.js +2 -1
- package/lib/commonjs/mol-theme/color.d.ts +15 -0
- package/lib/commonjs/mol-theme/color.js +2 -0
- package/lib/commonjs/mol-theme/label.d.ts +1 -1
- package/lib/commonjs/mol-theme/label.js +13 -1
- package/lib/commonjs/mol-util/param-definition.d.ts +4 -1
- package/lib/commonjs/mol-util/param-definition.js +5 -2
- package/lib/examples/alpha-orbitals/index.html +72 -72
- package/lib/examples/basic-wrapper/index.html +137 -137
- package/lib/examples/lighting/index.html +88 -88
- package/lib/examples/lighting/index.js +1 -1
- package/lib/examples/proteopedia-wrapper/index.html +236 -236
- package/lib/extensions/anvil/behavior.d.ts +1 -0
- package/lib/extensions/cellpack/model.js +2 -1
- package/lib/extensions/dnatco/confal-pyramids/behavior.d.ts +1 -0
- package/lib/extensions/meshes/choice.d.ts +26 -0
- package/lib/extensions/meshes/choice.js +28 -0
- package/lib/extensions/meshes/examples.d.ts +26 -0
- package/lib/extensions/meshes/examples.js +325 -0
- package/lib/extensions/meshes/mesh-cif-schema.d.ts +29 -0
- package/lib/extensions/meshes/mesh-cif-schema.js +30 -0
- package/lib/extensions/meshes/mesh-extension.d.ts +66 -0
- package/lib/extensions/meshes/mesh-extension.js +218 -0
- package/lib/extensions/meshes/mesh-streaming/behavior.d.ts +105 -0
- package/lib/extensions/meshes/mesh-streaming/behavior.js +375 -0
- package/lib/extensions/meshes/mesh-streaming/server-info.d.ts +54 -0
- package/lib/extensions/meshes/mesh-streaming/server-info.js +26 -0
- package/lib/extensions/meshes/mesh-streaming/transformers.d.ts +42 -0
- package/lib/extensions/meshes/mesh-streaming/transformers.js +270 -0
- package/lib/extensions/meshes/mesh-utils.d.ts +41 -0
- package/lib/extensions/meshes/mesh-utils.js +346 -0
- package/lib/extensions/meshes/metadata.d.ts +108 -0
- package/lib/extensions/meshes/metadata.js +69 -0
- package/lib/extensions/model-archive/quality-assessment/behavior.d.ts +2 -0
- package/lib/extensions/model-archive/quality-assessment/prop.d.ts +1 -0
- package/lib/extensions/model-archive/quality-assessment/prop.js +16 -4
- package/lib/extensions/rcsb/assembly-symmetry/behavior.d.ts +4 -2
- package/lib/extensions/rcsb/validation-report/behavior.d.ts +3 -0
- package/lib/extensions/volumes-and-segmentations/entry-meshes.d.ts +17 -0
- package/lib/extensions/volumes-and-segmentations/entry-meshes.js +153 -0
- package/lib/extensions/volumes-and-segmentations/entry-models.d.ts +12 -0
- package/lib/extensions/volumes-and-segmentations/entry-models.js +93 -0
- package/lib/extensions/volumes-and-segmentations/entry-root.d.ts +122 -0
- package/lib/extensions/volumes-and-segmentations/entry-root.js +571 -0
- package/lib/extensions/volumes-and-segmentations/entry-segmentation.d.ts +20 -0
- package/lib/extensions/volumes-and-segmentations/entry-segmentation.js +197 -0
- package/lib/extensions/volumes-and-segmentations/entry-state.d.ts +88 -0
- package/lib/extensions/volumes-and-segmentations/entry-state.js +29 -0
- package/lib/extensions/volumes-and-segmentations/entry-volume.d.ts +35 -0
- package/lib/extensions/volumes-and-segmentations/entry-volume.js +231 -0
- package/lib/extensions/volumes-and-segmentations/external-api.d.ts +11 -0
- package/lib/extensions/volumes-and-segmentations/external-api.js +80 -0
- package/lib/extensions/volumes-and-segmentations/global-state.d.ts +51 -0
- package/lib/extensions/volumes-and-segmentations/global-state.js +80 -0
- package/lib/extensions/volumes-and-segmentations/helpers.d.ts +56 -0
- package/lib/extensions/volumes-and-segmentations/helpers.js +163 -0
- package/lib/extensions/volumes-and-segmentations/index.d.ts +20 -0
- package/lib/extensions/volumes-and-segmentations/index.js +127 -0
- package/lib/extensions/volumes-and-segmentations/transformers.d.ts +33 -0
- package/lib/extensions/volumes-and-segmentations/transformers.js +82 -0
- package/lib/extensions/volumes-and-segmentations/ui.d.ts +29 -0
- package/lib/extensions/volumes-and-segmentations/ui.js +229 -0
- package/lib/extensions/volumes-and-segmentations/volseg-api/api.d.ts +22 -0
- package/lib/extensions/volumes-and-segmentations/volseg-api/api.js +80 -0
- package/lib/extensions/volumes-and-segmentations/volseg-api/data.d.ts +92 -0
- package/lib/extensions/volumes-and-segmentations/volseg-api/data.js +6 -0
- package/lib/extensions/volumes-and-segmentations/volseg-api/utils.d.ts +23 -0
- package/lib/extensions/volumes-and-segmentations/volseg-api/utils.js +75 -0
- package/lib/mol-canvas3d/canvas3d.d.ts +2 -0
- package/lib/mol-canvas3d/passes/draw.js +3 -3
- package/lib/mol-canvas3d/passes/image.d.ts +1 -0
- package/lib/mol-canvas3d/passes/postprocessing.d.ts +2 -1
- package/lib/mol-canvas3d/passes/postprocessing.js +27 -13
- package/lib/mol-geo/geometry/cylinders/cylinders.d.ts +2 -1
- package/lib/mol-geo/geometry/cylinders/cylinders.js +3 -2
- package/lib/mol-geo/geometry/lines/lines.d.ts +0 -1
- package/lib/mol-geo/geometry/points/points.d.ts +1 -1
- package/lib/mol-geo/geometry/spheres/spheres.d.ts +1 -0
- package/lib/mol-geo/geometry/spheres/spheres.js +3 -2
- package/lib/mol-gl/compute/histogram-pyramid/reduction.js +1 -2
- package/lib/mol-gl/compute/marching-cubes/isosurface.js +4 -6
- package/lib/mol-gl/renderable/cylinders.d.ts +1 -0
- package/lib/mol-gl/renderable/cylinders.js +1 -1
- package/lib/mol-gl/renderable/spheres.d.ts +1 -0
- package/lib/mol-gl/renderable/spheres.js +1 -1
- package/lib/mol-gl/shader/chunks/apply-light-color.glsl.d.ts +1 -1
- package/lib/mol-gl/shader/chunks/apply-light-color.glsl.js +1 -1
- package/lib/mol-gl/shader/chunks/clip-instance.glsl.d.ts +1 -1
- package/lib/mol-gl/shader/chunks/clip-instance.glsl.js +1 -1
- package/lib/mol-gl/shader/chunks/clip-pixel.glsl.d.ts +1 -1
- package/lib/mol-gl/shader/chunks/clip-pixel.glsl.js +1 -1
- package/lib/mol-gl/shader/chunks/common-clip.glsl.d.ts +2 -2
- package/lib/mol-gl/shader/chunks/common-clip.glsl.js +2 -2
- package/lib/mol-gl/shader/cylinders.frag.d.ts +1 -1
- package/lib/mol-gl/shader/cylinders.frag.js +1 -1
- package/lib/mol-gl/shader/cylinders.vert.d.ts +2 -2
- package/lib/mol-gl/shader/cylinders.vert.js +2 -2
- package/lib/mol-gl/shader/direct-volume.frag.d.ts +1 -1
- package/lib/mol-gl/shader/direct-volume.frag.js +1 -1
- package/lib/mol-gl/shader/outlines.frag.d.ts +1 -1
- package/lib/mol-gl/shader/outlines.frag.js +1 -1
- package/lib/mol-gl/shader/postprocessing.frag.d.ts +1 -1
- package/lib/mol-gl/shader/postprocessing.frag.js +1 -1
- package/lib/mol-gl/shader/spheres.frag.d.ts +1 -1
- package/lib/mol-gl/shader/spheres.frag.js +1 -1
- package/lib/mol-gl/shader/spheres.vert.d.ts +2 -2
- package/lib/mol-gl/shader/spheres.vert.js +2 -2
- package/lib/mol-gl/webgl/renderbuffer.d.ts +1 -1
- package/lib/mol-gl/webgl/renderbuffer.js +15 -0
- package/lib/mol-gl/webgl/state.d.ts +12 -0
- package/lib/mol-gl/webgl/state.js +136 -0
- package/lib/mol-io/reader/cif/schema/segmentation.d.ts +38 -0
- package/lib/mol-io/reader/cif/schema/segmentation.js +19 -0
- package/lib/mol-io/reader/cif.d.ts +3 -1
- package/lib/mol-io/reader/cif.js +3 -1
- package/lib/mol-model/location.d.ts +2 -1
- package/lib/mol-model/loci.d.ts +11 -11
- package/lib/mol-model/loci.js +13 -1
- package/lib/mol-model/sequence/alignment/sequence.d.ts +4 -1
- package/lib/mol-model/sequence/alignment/sequence.js +3 -2
- package/lib/mol-model/structure/model/properties/atomic/hierarchy.d.ts +6 -0
- package/lib/mol-model/structure/model/properties/utils/atomic-index.js +8 -0
- package/lib/mol-model/structure/structure/unit/bonds/inter-compute.js +21 -5
- package/lib/mol-model/structure/structure/util/superposition.d.ts +1 -0
- package/lib/mol-model/structure/structure/util/superposition.js +1 -1
- package/lib/mol-model/volume/volume.d.ts +35 -2
- package/lib/mol-model/volume/volume.js +79 -4
- package/lib/mol-model-formats/volume/segmentation.d.ts +23 -0
- package/lib/mol-model-formats/volume/segmentation.js +135 -0
- package/lib/mol-plugin/behavior/dynamic/representation.d.ts +2 -2
- package/lib/mol-plugin/behavior/dynamic/selection/structure-focus-representation.d.ts +1 -0
- package/lib/mol-plugin/behavior/dynamic/selection/structure-focus-representation.js +2 -1
- package/lib/mol-plugin/behavior/dynamic/volume-streaming/model.d.ts +2 -3
- package/lib/mol-plugin/commands.d.ts +1 -0
- package/lib/mol-plugin/version.js +2 -2
- package/lib/mol-plugin-state/animation/built-in/model-index.js +4 -1
- package/lib/mol-plugin-state/builder/structure/hierarchy-preset.d.ts +2 -0
- package/lib/mol-plugin-state/builder/structure/hierarchy.d.ts +1 -0
- package/lib/mol-plugin-state/builder/structure/representation-preset.d.ts +13 -4
- package/lib/mol-plugin-state/builder/structure/representation-preset.js +6 -1
- package/lib/mol-plugin-state/builder/structure/representation.d.ts +1 -0
- package/lib/mol-plugin-state/formats/provider.d.ts +2 -2
- package/lib/mol-plugin-state/formats/provider.js +11 -3
- package/lib/mol-plugin-state/formats/registry.js +6 -5
- package/lib/mol-plugin-state/formats/volume.d.ts +27 -0
- package/lib/mol-plugin-state/formats/volume.js +64 -0
- package/lib/mol-plugin-state/manager/structure/component.d.ts +1 -1
- package/lib/mol-plugin-state/manager/structure/component.js +18 -13
- package/lib/mol-plugin-state/transforms/representation.d.ts +1 -2
- package/lib/mol-plugin-state/transforms/representation.js +5 -6
- package/lib/mol-plugin-state/transforms/volume.d.ts +11 -1
- package/lib/mol-plugin-state/transforms/volume.js +54 -1
- package/lib/mol-plugin-ui/controls/line-graph/line-graph-component.d.ts +1 -0
- package/lib/mol-plugin-ui/controls/line-graph/line-graph-component.js +33 -13
- package/lib/mol-plugin-ui/controls/parameters.d.ts +1 -0
- package/lib/mol-plugin-ui/controls/parameters.js +22 -5
- package/lib/mol-plugin-ui/sequence/sequence.d.ts +25 -17
- package/lib/mol-plugin-ui/sequence.d.ts +19 -1
- package/lib/mol-plugin-ui/sequence.js +7 -7
- package/lib/mol-plugin-ui/skin/base/base.scss +32 -32
- package/lib/mol-plugin-ui/skin/base/components/controls-base.scss +333 -333
- package/lib/mol-plugin-ui/skin/base/components/controls.scss +418 -418
- package/lib/mol-plugin-ui/skin/base/components/help.scss +27 -27
- package/lib/mol-plugin-ui/skin/base/components/line-graph.scss +67 -67
- package/lib/mol-plugin-ui/skin/base/components/log.scss +100 -100
- package/lib/mol-plugin-ui/skin/base/components/misc.scss +643 -643
- package/lib/mol-plugin-ui/skin/base/components/sequence.scss +125 -125
- package/lib/mol-plugin-ui/skin/base/components/slider.scss +165 -165
- package/lib/mol-plugin-ui/skin/base/components/tasks.scss +99 -99
- package/lib/mol-plugin-ui/skin/base/components/toast.scss +83 -83
- package/lib/mol-plugin-ui/skin/base/components/transformer.scss +163 -163
- package/lib/mol-plugin-ui/skin/base/components/viewport.scss +137 -128
- package/lib/mol-plugin-ui/skin/base/layout/common.scss +71 -71
- package/lib/mol-plugin-ui/skin/base/layout/controls-landscape.scss +89 -89
- package/lib/mol-plugin-ui/skin/base/layout/controls-outside.scss +98 -98
- package/lib/mol-plugin-ui/skin/base/layout/controls-portrait.scss +108 -108
- package/lib/mol-plugin-ui/skin/base/layout.scss +40 -40
- package/lib/mol-plugin-ui/skin/base/logo.scss +12 -12
- package/lib/mol-plugin-ui/skin/base/normalize.scss +209 -209
- package/lib/mol-plugin-ui/skin/base/ui.scss +40 -40
- package/lib/mol-plugin-ui/skin/base/variables.scss +85 -85
- package/lib/mol-plugin-ui/skin/blue.scss +1 -1
- package/lib/mol-plugin-ui/skin/colors/blue.scss +23 -23
- package/lib/mol-plugin-ui/skin/colors/dark.scss +23 -23
- package/lib/mol-plugin-ui/skin/colors/light.scss +29 -29
- package/lib/mol-plugin-ui/skin/dark.scss +1 -1
- package/lib/mol-plugin-ui/skin/light.scss +1 -1
- package/lib/mol-plugin-ui/state/apply-action.d.ts +2 -10
- package/lib/mol-plugin-ui/state/apply-action.js +2 -2
- package/lib/mol-plugin-ui/structure/quick-styles.js +2 -2
- package/lib/mol-plugin-ui/structure/superposition.d.ts +1 -1
- package/lib/mol-plugin-ui/structure/volume.d.ts +1 -1
- package/lib/mol-plugin-ui/structure/volume.js +3 -2
- package/lib/mol-repr/structure/complex-visual.d.ts +1 -0
- package/lib/mol-repr/structure/params.d.ts +2 -0
- package/lib/mol-repr/structure/registry.d.ts +12 -0
- package/lib/mol-repr/structure/representation/backbone.d.ts +3 -0
- package/lib/mol-repr/structure/representation/ball-and-stick.d.ts +6 -0
- package/lib/mol-repr/structure/representation/ellipsoid.d.ts +6 -0
- package/lib/mol-repr/structure/representation/gaussian-surface.d.ts +3 -0
- package/lib/mol-repr/structure/representation/gaussian-volume.d.ts +3 -0
- package/lib/mol-repr/structure/representation/line.d.ts +3 -0
- package/lib/mol-repr/structure/representation/molecular-surface.d.ts +3 -0
- package/lib/mol-repr/structure/representation/point.d.ts +3 -0
- package/lib/mol-repr/structure/representation/spacefill.d.ts +6 -0
- package/lib/mol-repr/structure/units-visual.d.ts +2 -0
- package/lib/mol-repr/structure/visual/bond-inter-unit-cylinder.d.ts +4 -0
- package/lib/mol-repr/structure/visual/bond-inter-unit-cylinder.js +2 -0
- package/lib/mol-repr/structure/visual/bond-inter-unit-line.d.ts +1 -0
- package/lib/mol-repr/structure/visual/bond-inter-unit-line.js +1 -0
- package/lib/mol-repr/structure/visual/bond-intra-unit-cylinder.d.ts +4 -0
- package/lib/mol-repr/structure/visual/bond-intra-unit-cylinder.js +2 -0
- package/lib/mol-repr/structure/visual/bond-intra-unit-line.d.ts +1 -0
- package/lib/mol-repr/structure/visual/bond-intra-unit-line.js +1 -0
- package/lib/mol-repr/structure/visual/element-cross.d.ts +1 -0
- package/lib/mol-repr/structure/visual/element-cross.js +2 -1
- package/lib/mol-repr/structure/visual/element-point.d.ts +1 -0
- package/lib/mol-repr/structure/visual/element-point.js +2 -1
- package/lib/mol-repr/structure/visual/element-sphere.d.ts +4 -0
- package/lib/mol-repr/structure/visual/element-sphere.js +3 -1
- package/lib/mol-repr/structure/visual/gaussian-density-volume.d.ts +2 -0
- package/lib/mol-repr/structure/visual/gaussian-density-volume.js +6 -2
- package/lib/mol-repr/structure/visual/gaussian-surface-mesh.d.ts +4 -0
- package/lib/mol-repr/structure/visual/gaussian-surface-mesh.js +9 -1
- package/lib/mol-repr/structure/visual/gaussian-surface-wireframe.d.ts +1 -0
- package/lib/mol-repr/structure/visual/gaussian-surface-wireframe.js +3 -1
- package/lib/mol-repr/structure/visual/molecular-surface-mesh.d.ts +1 -0
- package/lib/mol-repr/structure/visual/molecular-surface-mesh.js +4 -0
- package/lib/mol-repr/structure/visual/molecular-surface-wireframe.d.ts +1 -0
- package/lib/mol-repr/structure/visual/molecular-surface-wireframe.js +2 -0
- package/lib/mol-repr/structure/visual/polymer-backbone-cylinder.d.ts +2 -0
- package/lib/mol-repr/structure/visual/polymer-backbone-sphere.d.ts +2 -0
- package/lib/mol-repr/structure/visual/util/bond.d.ts +7 -0
- package/lib/mol-repr/structure/visual/util/bond.js +19 -8
- package/lib/mol-repr/structure/visual/util/common.d.ts +4 -1
- package/lib/mol-repr/structure/visual/util/common.js +10 -6
- package/lib/mol-repr/structure/visual/util/element.d.ts +1 -0
- package/lib/mol-repr/structure/visual/util/element.js +3 -4
- package/lib/mol-repr/structure/visual/util/gaussian.d.ts +2 -0
- package/lib/mol-repr/volume/direct-volume.d.ts +4 -4
- package/lib/mol-repr/volume/direct-volume.js +8 -6
- package/lib/mol-repr/volume/isosurface.d.ts +4 -4
- package/lib/mol-repr/volume/isosurface.js +17 -16
- package/lib/mol-repr/volume/registry.d.ts +54 -1
- package/lib/mol-repr/volume/registry.js +3 -1
- package/lib/mol-repr/volume/representation.d.ts +11 -7
- package/lib/mol-repr/volume/representation.js +144 -49
- package/lib/mol-repr/volume/segment.d.ts +291 -0
- package/lib/mol-repr/volume/segment.js +279 -0
- package/lib/mol-repr/volume/slice.d.ts +2 -2
- package/lib/mol-repr/volume/slice.js +5 -5
- package/lib/mol-repr/volume/util.d.ts +12 -3
- package/lib/mol-repr/volume/util.js +71 -6
- package/lib/mol-script/language/builder.d.ts +1 -0
- package/lib/mol-theme/color/volume-segment.d.ts +41 -0
- package/lib/mol-theme/color/volume-segment.js +53 -0
- package/lib/mol-theme/color/volume-value.js +2 -1
- package/lib/mol-theme/color.d.ts +15 -0
- package/lib/mol-theme/color.js +2 -0
- package/lib/mol-theme/label.d.ts +1 -1
- package/lib/mol-theme/label.js +13 -1
- package/lib/mol-util/param-definition.d.ts +4 -1
- package/lib/mol-util/param-definition.js +5 -2
- package/package.json +169 -168
|
@@ -16,6 +16,7 @@ export declare const InterUnitBondCylinderParams: {
|
|
|
16
16
|
includeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
17
17
|
excludeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
18
18
|
ignoreHydrogens: PD.BooleanParam;
|
|
19
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
19
20
|
aromaticBonds: PD.BooleanParam;
|
|
20
21
|
multipleBonds: PD.Select<"offset" | "off" | "symmetric">;
|
|
21
22
|
linkScale: PD.Numeric;
|
|
@@ -34,6 +35,7 @@ export declare const InterUnitBondCylinderParams: {
|
|
|
34
35
|
ignoreLight: PD.BooleanParam;
|
|
35
36
|
xrayShaded: PD.BooleanParam;
|
|
36
37
|
transparentBackfaces: PD.Select<string>;
|
|
38
|
+
solidInterior: PD.BooleanParam;
|
|
37
39
|
bumpFrequency: PD.Numeric;
|
|
38
40
|
bumpAmplitude: PD.Numeric;
|
|
39
41
|
alpha: PD.Numeric;
|
|
@@ -67,6 +69,7 @@ export declare function InterUnitBondCylinderVisual(materialId: number, structur
|
|
|
67
69
|
includeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
68
70
|
excludeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
69
71
|
ignoreHydrogens: PD.BooleanParam;
|
|
72
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
70
73
|
aromaticBonds: PD.BooleanParam;
|
|
71
74
|
multipleBonds: PD.Select<"offset" | "off" | "symmetric">;
|
|
72
75
|
linkScale: PD.Numeric;
|
|
@@ -85,6 +88,7 @@ export declare function InterUnitBondCylinderVisual(materialId: number, structur
|
|
|
85
88
|
ignoreLight: PD.BooleanParam;
|
|
86
89
|
xrayShaded: PD.BooleanParam;
|
|
87
90
|
transparentBackfaces: PD.Select<string>;
|
|
91
|
+
solidInterior: PD.BooleanParam;
|
|
88
92
|
bumpFrequency: PD.Numeric;
|
|
89
93
|
bumpAmplitude: PD.Numeric;
|
|
90
94
|
alpha: PD.Numeric;
|
|
@@ -190,6 +190,7 @@ function InterUnitBondCylinderImpostorVisual(materialId) {
|
|
|
190
190
|
newProps.linkScale !== currentProps.linkScale ||
|
|
191
191
|
newProps.linkSpacing !== currentProps.linkSpacing ||
|
|
192
192
|
newProps.ignoreHydrogens !== currentProps.ignoreHydrogens ||
|
|
193
|
+
newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant ||
|
|
193
194
|
newProps.linkCap !== currentProps.linkCap ||
|
|
194
195
|
newProps.aromaticScale !== currentProps.aromaticScale ||
|
|
195
196
|
newProps.aromaticSpacing !== currentProps.aromaticSpacing ||
|
|
@@ -229,6 +230,7 @@ function InterUnitBondCylinderMeshVisual(materialId) {
|
|
|
229
230
|
newProps.linkScale !== currentProps.linkScale ||
|
|
230
231
|
newProps.linkSpacing !== currentProps.linkSpacing ||
|
|
231
232
|
newProps.ignoreHydrogens !== currentProps.ignoreHydrogens ||
|
|
233
|
+
newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant ||
|
|
232
234
|
newProps.linkCap !== currentProps.linkCap ||
|
|
233
235
|
newProps.aromaticScale !== currentProps.aromaticScale ||
|
|
234
236
|
newProps.aromaticSpacing !== currentProps.aromaticSpacing ||
|
|
@@ -10,6 +10,7 @@ export declare const InterUnitBondLineParams: {
|
|
|
10
10
|
includeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
11
11
|
excludeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
12
12
|
ignoreHydrogens: PD.BooleanParam;
|
|
13
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
13
14
|
aromaticBonds: PD.BooleanParam;
|
|
14
15
|
multipleBonds: PD.Select<"offset" | "off" | "symmetric">;
|
|
15
16
|
linkScale: PD.Numeric;
|
|
@@ -125,6 +125,7 @@ function InterUnitBondLineVisual(materialId) {
|
|
|
125
125
|
newProps.aromaticDashCount !== currentProps.aromaticDashCount ||
|
|
126
126
|
newProps.dashCount !== currentProps.dashCount ||
|
|
127
127
|
newProps.ignoreHydrogens !== currentProps.ignoreHydrogens ||
|
|
128
|
+
newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant ||
|
|
128
129
|
!(0, mol_util_1.arrayEqual)(newProps.includeTypes, currentProps.includeTypes) ||
|
|
129
130
|
!(0, mol_util_1.arrayEqual)(newProps.excludeTypes, currentProps.excludeTypes) ||
|
|
130
131
|
newProps.multipleBonds !== currentProps.multipleBonds);
|
|
@@ -17,6 +17,7 @@ export declare const IntraUnitBondCylinderParams: {
|
|
|
17
17
|
includeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
18
18
|
excludeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
19
19
|
ignoreHydrogens: PD.BooleanParam;
|
|
20
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
20
21
|
aromaticBonds: PD.BooleanParam;
|
|
21
22
|
multipleBonds: PD.Select<"offset" | "off" | "symmetric">;
|
|
22
23
|
linkScale: PD.Numeric;
|
|
@@ -35,6 +36,7 @@ export declare const IntraUnitBondCylinderParams: {
|
|
|
35
36
|
ignoreLight: PD.BooleanParam;
|
|
36
37
|
xrayShaded: PD.BooleanParam;
|
|
37
38
|
transparentBackfaces: PD.Select<string>;
|
|
39
|
+
solidInterior: PD.BooleanParam;
|
|
38
40
|
bumpFrequency: PD.Numeric;
|
|
39
41
|
bumpAmplitude: PD.Numeric;
|
|
40
42
|
alpha: PD.Numeric;
|
|
@@ -68,6 +70,7 @@ export declare function IntraUnitBondCylinderVisual(materialId: number, structur
|
|
|
68
70
|
includeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
69
71
|
excludeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
70
72
|
ignoreHydrogens: PD.BooleanParam;
|
|
73
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
71
74
|
aromaticBonds: PD.BooleanParam;
|
|
72
75
|
multipleBonds: PD.Select<"offset" | "off" | "symmetric">;
|
|
73
76
|
linkScale: PD.Numeric;
|
|
@@ -86,6 +89,7 @@ export declare function IntraUnitBondCylinderVisual(materialId: number, structur
|
|
|
86
89
|
ignoreLight: PD.BooleanParam;
|
|
87
90
|
xrayShaded: PD.BooleanParam;
|
|
88
91
|
transparentBackfaces: PD.Select<string>;
|
|
92
|
+
solidInterior: PD.BooleanParam;
|
|
89
93
|
bumpFrequency: PD.Numeric;
|
|
90
94
|
bumpAmplitude: PD.Numeric;
|
|
91
95
|
alpha: PD.Numeric;
|
|
@@ -211,6 +211,7 @@ function IntraUnitBondCylinderImpostorVisual(materialId) {
|
|
|
211
211
|
newProps.linkScale !== currentProps.linkScale ||
|
|
212
212
|
newProps.linkSpacing !== currentProps.linkSpacing ||
|
|
213
213
|
newProps.ignoreHydrogens !== currentProps.ignoreHydrogens ||
|
|
214
|
+
newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant ||
|
|
214
215
|
newProps.linkCap !== currentProps.linkCap ||
|
|
215
216
|
newProps.aromaticScale !== currentProps.aromaticScale ||
|
|
216
217
|
newProps.aromaticSpacing !== currentProps.aromaticSpacing ||
|
|
@@ -255,6 +256,7 @@ function IntraUnitBondCylinderMeshVisual(materialId) {
|
|
|
255
256
|
newProps.linkScale !== currentProps.linkScale ||
|
|
256
257
|
newProps.linkSpacing !== currentProps.linkSpacing ||
|
|
257
258
|
newProps.ignoreHydrogens !== currentProps.ignoreHydrogens ||
|
|
259
|
+
newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant ||
|
|
258
260
|
newProps.linkCap !== currentProps.linkCap ||
|
|
259
261
|
newProps.aromaticScale !== currentProps.aromaticScale ||
|
|
260
262
|
newProps.aromaticSpacing !== currentProps.aromaticSpacing ||
|
|
@@ -10,6 +10,7 @@ export declare const IntraUnitBondLineParams: {
|
|
|
10
10
|
includeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
11
11
|
excludeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
12
12
|
ignoreHydrogens: PD.BooleanParam;
|
|
13
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
13
14
|
aromaticBonds: PD.BooleanParam;
|
|
14
15
|
multipleBonds: PD.Select<"offset" | "off" | "symmetric">;
|
|
15
16
|
linkScale: PD.Numeric;
|
|
@@ -147,6 +147,7 @@ function IntraUnitBondLineVisual(materialId) {
|
|
|
147
147
|
newProps.aromaticDashCount !== currentProps.aromaticDashCount ||
|
|
148
148
|
newProps.dashCount !== currentProps.dashCount ||
|
|
149
149
|
newProps.ignoreHydrogens !== currentProps.ignoreHydrogens ||
|
|
150
|
+
newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant ||
|
|
150
151
|
!(0, mol_util_1.arrayEqual)(newProps.includeTypes, currentProps.includeTypes) ||
|
|
151
152
|
!(0, mol_util_1.arrayEqual)(newProps.excludeTypes, currentProps.excludeTypes) ||
|
|
152
153
|
newProps.aromaticBonds !== currentProps.aromaticBonds ||
|
|
@@ -12,6 +12,7 @@ import { Lines } from '../../../mol-geo/geometry/lines/lines';
|
|
|
12
12
|
export declare const ElementCrossParams: {
|
|
13
13
|
lineSizeAttenuation: PD.BooleanParam;
|
|
14
14
|
ignoreHydrogens: PD.BooleanParam;
|
|
15
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
15
16
|
traceOnly: PD.BooleanParam;
|
|
16
17
|
crosses: PD.Select<"all" | "lone">;
|
|
17
18
|
crossSize: PD.Numeric;
|
|
@@ -21,7 +21,7 @@ var v3scaleAndAdd = linear_algebra_1.Vec3.scaleAndAdd;
|
|
|
21
21
|
var v3unitX = linear_algebra_1.Vec3.unitX;
|
|
22
22
|
var v3unitY = linear_algebra_1.Vec3.unitY;
|
|
23
23
|
var v3unitZ = linear_algebra_1.Vec3.unitZ;
|
|
24
|
-
exports.ElementCrossParams = tslib_1.__assign(tslib_1.__assign({}, units_visual_1.UnitsLinesParams), { lineSizeAttenuation: param_definition_1.ParamDefinition.Boolean(false), ignoreHydrogens: param_definition_1.ParamDefinition.Boolean(false), traceOnly: param_definition_1.ParamDefinition.Boolean(false), crosses: param_definition_1.ParamDefinition.Select('lone', param_definition_1.ParamDefinition.arrayToOptions(['lone', 'all'])), crossSize: param_definition_1.ParamDefinition.Numeric(0.35, { min: 0, max: 2, step: 0.01 }) });
|
|
24
|
+
exports.ElementCrossParams = tslib_1.__assign(tslib_1.__assign({}, units_visual_1.UnitsLinesParams), { lineSizeAttenuation: param_definition_1.ParamDefinition.Boolean(false), ignoreHydrogens: param_definition_1.ParamDefinition.Boolean(false), ignoreHydrogensVariant: param_definition_1.ParamDefinition.Select('all', param_definition_1.ParamDefinition.arrayToOptions(['all', 'non-polar'])), traceOnly: param_definition_1.ParamDefinition.Boolean(false), crosses: param_definition_1.ParamDefinition.Select('lone', param_definition_1.ParamDefinition.arrayToOptions(['lone', 'all'])), crossSize: param_definition_1.ParamDefinition.Numeric(0.35, { min: 0, max: 2, step: 0.01 }) });
|
|
25
25
|
function createElementCross(ctx, unit, structure, theme, props, lines) {
|
|
26
26
|
var child = structure.child;
|
|
27
27
|
if (child && !child.unitMap.get(unit.id))
|
|
@@ -67,6 +67,7 @@ function ElementCrossVisual(materialId) {
|
|
|
67
67
|
eachLocation: element_1.eachElement,
|
|
68
68
|
setUpdateState: function (state, newProps, currentProps) {
|
|
69
69
|
state.createGeometry = (newProps.ignoreHydrogens !== currentProps.ignoreHydrogens ||
|
|
70
|
+
newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant ||
|
|
70
71
|
newProps.traceOnly !== currentProps.traceOnly ||
|
|
71
72
|
newProps.crosses !== currentProps.crosses ||
|
|
72
73
|
newProps.crossSize !== currentProps.crossSize);
|
|
@@ -12,6 +12,7 @@ import { Points } from '../../../mol-geo/geometry/points/points';
|
|
|
12
12
|
export declare const ElementPointParams: {
|
|
13
13
|
pointSizeAttenuation: PD.BooleanParam;
|
|
14
14
|
ignoreHydrogens: PD.BooleanParam;
|
|
15
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
15
16
|
traceOnly: PD.BooleanParam;
|
|
16
17
|
unitKinds: PD.MultiSelect<"spheres" | "gaussians" | "atomic">;
|
|
17
18
|
includeParent: PD.BooleanParam;
|
|
@@ -16,7 +16,7 @@ var element_1 = require("./util/element");
|
|
|
16
16
|
var geometry_1 = require("../../../mol-math/geometry");
|
|
17
17
|
// avoiding namespace lookup improved performance in Chrome (Aug 2020)
|
|
18
18
|
var v3add = linear_algebra_1.Vec3.add;
|
|
19
|
-
exports.ElementPointParams = tslib_1.__assign(tslib_1.__assign({}, units_visual_1.UnitsPointsParams), { pointSizeAttenuation: param_definition_1.ParamDefinition.Boolean(false), ignoreHydrogens: param_definition_1.ParamDefinition.Boolean(false), traceOnly: param_definition_1.ParamDefinition.Boolean(false) });
|
|
19
|
+
exports.ElementPointParams = tslib_1.__assign(tslib_1.__assign({}, units_visual_1.UnitsPointsParams), { pointSizeAttenuation: param_definition_1.ParamDefinition.Boolean(false), ignoreHydrogens: param_definition_1.ParamDefinition.Boolean(false), ignoreHydrogensVariant: param_definition_1.ParamDefinition.Select('all', param_definition_1.ParamDefinition.arrayToOptions(['all', 'non-polar'])), traceOnly: param_definition_1.ParamDefinition.Boolean(false) });
|
|
20
20
|
// TODO size
|
|
21
21
|
function createElementPoint(ctx, unit, structure, theme, props, points) {
|
|
22
22
|
// TODO sizeFactor
|
|
@@ -75,6 +75,7 @@ function ElementPointVisual(materialId) {
|
|
|
75
75
|
eachLocation: element_1.eachElement,
|
|
76
76
|
setUpdateState: function (state, newProps, currentProps) {
|
|
77
77
|
state.createGeometry = (newProps.ignoreHydrogens !== currentProps.ignoreHydrogens ||
|
|
78
|
+
newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant ||
|
|
78
79
|
newProps.traceOnly !== currentProps.traceOnly);
|
|
79
80
|
}
|
|
80
81
|
}, materialId);
|
|
@@ -12,6 +12,7 @@ export declare const ElementSphereParams: {
|
|
|
12
12
|
sizeFactor: PD.Numeric;
|
|
13
13
|
detail: PD.Numeric;
|
|
14
14
|
ignoreHydrogens: PD.BooleanParam;
|
|
15
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
15
16
|
traceOnly: PD.BooleanParam;
|
|
16
17
|
tryUseImpostor: PD.BooleanParam;
|
|
17
18
|
unitKinds: PD.MultiSelect<"spheres" | "gaussians" | "atomic">;
|
|
@@ -20,6 +21,7 @@ export declare const ElementSphereParams: {
|
|
|
20
21
|
ignoreLight: PD.BooleanParam;
|
|
21
22
|
xrayShaded: PD.BooleanParam;
|
|
22
23
|
transparentBackfaces: PD.Select<string>;
|
|
24
|
+
solidInterior: PD.BooleanParam;
|
|
23
25
|
bumpFrequency: PD.Numeric;
|
|
24
26
|
bumpAmplitude: PD.Numeric;
|
|
25
27
|
alpha: PD.Numeric;
|
|
@@ -48,6 +50,7 @@ export declare function ElementSphereVisual(materialId: number, structure: Struc
|
|
|
48
50
|
sizeFactor: PD.Numeric;
|
|
49
51
|
detail: PD.Numeric;
|
|
50
52
|
ignoreHydrogens: PD.BooleanParam;
|
|
53
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
51
54
|
traceOnly: PD.BooleanParam;
|
|
52
55
|
tryUseImpostor: PD.BooleanParam;
|
|
53
56
|
unitKinds: PD.MultiSelect<"spheres" | "gaussians" | "atomic">;
|
|
@@ -56,6 +59,7 @@ export declare function ElementSphereVisual(materialId: number, structure: Struc
|
|
|
56
59
|
ignoreLight: PD.BooleanParam;
|
|
57
60
|
xrayShaded: PD.BooleanParam;
|
|
58
61
|
transparentBackfaces: PD.Select<string>;
|
|
62
|
+
solidInterior: PD.BooleanParam;
|
|
59
63
|
bumpFrequency: PD.Numeric;
|
|
60
64
|
bumpAmplitude: PD.Numeric;
|
|
61
65
|
alpha: PD.Numeric;
|
|
@@ -12,7 +12,7 @@ var param_definition_1 = require("../../../mol-util/param-definition");
|
|
|
12
12
|
var units_visual_1 = require("../units-visual");
|
|
13
13
|
var element_1 = require("./util/element");
|
|
14
14
|
var base_1 = require("../../../mol-geo/geometry/base");
|
|
15
|
-
exports.ElementSphereParams = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, units_visual_1.UnitsMeshParams), units_visual_1.UnitsSpheresParams), { sizeFactor: param_definition_1.ParamDefinition.Numeric(1, { min: 0, max: 10, step: 0.1 }), detail: param_definition_1.ParamDefinition.Numeric(0, { min: 0, max: 3, step: 1 }, base_1.BaseGeometry.CustomQualityParamInfo), ignoreHydrogens: param_definition_1.ParamDefinition.Boolean(false), traceOnly: param_definition_1.ParamDefinition.Boolean(false), tryUseImpostor: param_definition_1.ParamDefinition.Boolean(true) });
|
|
15
|
+
exports.ElementSphereParams = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, units_visual_1.UnitsMeshParams), units_visual_1.UnitsSpheresParams), { sizeFactor: param_definition_1.ParamDefinition.Numeric(1, { min: 0, max: 10, step: 0.1 }), detail: param_definition_1.ParamDefinition.Numeric(0, { min: 0, max: 3, step: 1 }, base_1.BaseGeometry.CustomQualityParamInfo), ignoreHydrogens: param_definition_1.ParamDefinition.Boolean(false), ignoreHydrogensVariant: param_definition_1.ParamDefinition.Select('all', param_definition_1.ParamDefinition.arrayToOptions(['all', 'non-polar'])), traceOnly: param_definition_1.ParamDefinition.Boolean(false), tryUseImpostor: param_definition_1.ParamDefinition.Boolean(true) });
|
|
16
16
|
function ElementSphereVisual(materialId, structure, props, webgl) {
|
|
17
17
|
return props.tryUseImpostor && webgl && webgl.extensions.fragDepth
|
|
18
18
|
? ElementSphereImpostorVisual(materialId)
|
|
@@ -28,6 +28,7 @@ function ElementSphereImpostorVisual(materialId) {
|
|
|
28
28
|
eachLocation: element_1.eachElement,
|
|
29
29
|
setUpdateState: function (state, newProps, currentProps) {
|
|
30
30
|
state.createGeometry = (newProps.ignoreHydrogens !== currentProps.ignoreHydrogens ||
|
|
31
|
+
newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant ||
|
|
31
32
|
newProps.traceOnly !== currentProps.traceOnly);
|
|
32
33
|
},
|
|
33
34
|
mustRecreate: function (structureGroup, props, webgl) {
|
|
@@ -47,6 +48,7 @@ function ElementSphereMeshVisual(materialId) {
|
|
|
47
48
|
state.createGeometry = (newProps.sizeFactor !== currentProps.sizeFactor ||
|
|
48
49
|
newProps.detail !== currentProps.detail ||
|
|
49
50
|
newProps.ignoreHydrogens !== currentProps.ignoreHydrogens ||
|
|
51
|
+
newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant ||
|
|
50
52
|
newProps.traceOnly !== currentProps.traceOnly);
|
|
51
53
|
},
|
|
52
54
|
mustRecreate: function (structureGroup, props, webgl) {
|
|
@@ -8,6 +8,7 @@ import { ComplexVisual } from '../complex-visual';
|
|
|
8
8
|
import { UnitsVisual } from '../units-visual';
|
|
9
9
|
export declare const GaussianDensityVolumeParams: {
|
|
10
10
|
ignoreHydrogens: PD.BooleanParam;
|
|
11
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
11
12
|
includeParent: PD.BooleanParam;
|
|
12
13
|
traceOnly: PD.BooleanParam;
|
|
13
14
|
resolution: PD.Numeric;
|
|
@@ -42,6 +43,7 @@ export type GaussianDensityVolumeParams = typeof GaussianDensityVolumeParams;
|
|
|
42
43
|
export declare function GaussianDensityVolumeVisual(materialId: number): ComplexVisual<GaussianDensityVolumeParams>;
|
|
43
44
|
export declare const UnitsGaussianDensityVolumeParams: {
|
|
44
45
|
ignoreHydrogens: PD.BooleanParam;
|
|
46
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
45
47
|
includeParent: PD.BooleanParam;
|
|
46
48
|
traceOnly: PD.BooleanParam;
|
|
47
49
|
resolution: PD.Numeric;
|
|
@@ -42,7 +42,7 @@ function createGaussianDensityVolume(ctx, structure, theme, props, directVolume)
|
|
|
42
42
|
});
|
|
43
43
|
});
|
|
44
44
|
}
|
|
45
|
-
exports.GaussianDensityVolumeParams = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, complex_visual_1.ComplexDirectVolumeParams), gaussian_1.GaussianDensityParams), { ignoreHydrogens: param_definition_1.ParamDefinition.Boolean(false), includeParent: param_definition_1.ParamDefinition.Boolean(false, { isHidden: true }) });
|
|
45
|
+
exports.GaussianDensityVolumeParams = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, complex_visual_1.ComplexDirectVolumeParams), gaussian_1.GaussianDensityParams), { ignoreHydrogens: param_definition_1.ParamDefinition.Boolean(false), ignoreHydrogensVariant: param_definition_1.ParamDefinition.Select('all', param_definition_1.ParamDefinition.arrayToOptions(['all', 'non-polar'])), includeParent: param_definition_1.ParamDefinition.Boolean(false, { isHidden: true }) });
|
|
46
46
|
function GaussianDensityVolumeVisual(materialId) {
|
|
47
47
|
return (0, complex_visual_1.ComplexDirectVolumeVisual)({
|
|
48
48
|
defaultProps: param_definition_1.ParamDefinition.getDefaultValues(exports.GaussianDensityVolumeParams),
|
|
@@ -59,6 +59,8 @@ function GaussianDensityVolumeVisual(materialId) {
|
|
|
59
59
|
state.createGeometry = true;
|
|
60
60
|
if (newProps.ignoreHydrogens !== currentProps.ignoreHydrogens)
|
|
61
61
|
state.createGeometry = true;
|
|
62
|
+
if (newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant)
|
|
63
|
+
state.createGeometry = true;
|
|
62
64
|
if (newProps.traceOnly !== currentProps.traceOnly)
|
|
63
65
|
state.createGeometry = true;
|
|
64
66
|
if (newProps.includeParent !== currentProps.includeParent)
|
|
@@ -101,7 +103,7 @@ function createUnitsGaussianDensityVolume(ctx, unit, structure, theme, props, di
|
|
|
101
103
|
});
|
|
102
104
|
});
|
|
103
105
|
}
|
|
104
|
-
exports.UnitsGaussianDensityVolumeParams = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, units_visual_1.UnitsDirectVolumeParams), gaussian_1.GaussianDensityParams), { ignoreHydrogens: param_definition_1.ParamDefinition.Boolean(false), includeParent: param_definition_1.ParamDefinition.Boolean(false, { isHidden: true }) });
|
|
106
|
+
exports.UnitsGaussianDensityVolumeParams = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, units_visual_1.UnitsDirectVolumeParams), gaussian_1.GaussianDensityParams), { ignoreHydrogens: param_definition_1.ParamDefinition.Boolean(false), ignoreHydrogensVariant: param_definition_1.ParamDefinition.Select('all', param_definition_1.ParamDefinition.arrayToOptions(['all', 'non-polar'])), includeParent: param_definition_1.ParamDefinition.Boolean(false, { isHidden: true }) });
|
|
105
107
|
function UnitsGaussianDensityVolumeVisual(materialId) {
|
|
106
108
|
return (0, units_visual_1.UnitsDirectVolumeVisual)({
|
|
107
109
|
defaultProps: param_definition_1.ParamDefinition.getDefaultValues(exports.UnitsGaussianDensityVolumeParams),
|
|
@@ -118,6 +120,8 @@ function UnitsGaussianDensityVolumeVisual(materialId) {
|
|
|
118
120
|
state.createGeometry = true;
|
|
119
121
|
if (newProps.ignoreHydrogens !== currentProps.ignoreHydrogens)
|
|
120
122
|
state.createGeometry = true;
|
|
123
|
+
if (newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant)
|
|
124
|
+
state.createGeometry = true;
|
|
121
125
|
if (newProps.traceOnly !== currentProps.traceOnly)
|
|
122
126
|
state.createGeometry = true;
|
|
123
127
|
if (newProps.includeParent !== currentProps.includeParent)
|
|
@@ -10,6 +10,7 @@ import { ComplexVisual } from '../complex-visual';
|
|
|
10
10
|
import { WebGLContext } from '../../../mol-gl/webgl/context';
|
|
11
11
|
export declare const GaussianSurfaceMeshParams: {
|
|
12
12
|
ignoreHydrogens: PD.BooleanParam;
|
|
13
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
13
14
|
tryUseGpu: PD.BooleanParam;
|
|
14
15
|
includeParent: PD.BooleanParam;
|
|
15
16
|
smoothColors: PD.Mapped<PD.NamedParams<PD.Normalize<unknown>, "auto"> | PD.NamedParams<PD.Normalize<{
|
|
@@ -51,6 +52,7 @@ export declare const GaussianSurfaceMeshParams: {
|
|
|
51
52
|
export type GaussianSurfaceMeshParams = typeof GaussianSurfaceMeshParams;
|
|
52
53
|
export declare const StructureGaussianSurfaceMeshParams: {
|
|
53
54
|
ignoreHydrogens: PD.BooleanParam;
|
|
55
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
54
56
|
tryUseGpu: PD.BooleanParam;
|
|
55
57
|
includeParent: PD.BooleanParam;
|
|
56
58
|
smoothColors: PD.Mapped<PD.NamedParams<PD.Normalize<unknown>, "auto"> | PD.NamedParams<PD.Normalize<{
|
|
@@ -92,6 +94,7 @@ export declare const StructureGaussianSurfaceMeshParams: {
|
|
|
92
94
|
export type StructureGaussianSurfaceMeshParams = typeof StructureGaussianSurfaceMeshParams;
|
|
93
95
|
export declare function GaussianSurfaceVisual(materialId: number, structure: Structure, props: PD.Values<GaussianSurfaceMeshParams>, webgl?: WebGLContext): UnitsVisual<{
|
|
94
96
|
ignoreHydrogens: PD.BooleanParam;
|
|
97
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
95
98
|
tryUseGpu: PD.BooleanParam;
|
|
96
99
|
includeParent: PD.BooleanParam;
|
|
97
100
|
smoothColors: PD.Mapped<PD.NamedParams<PD.Normalize<unknown>, "auto"> | PD.NamedParams<PD.Normalize<{
|
|
@@ -132,6 +135,7 @@ export declare function GaussianSurfaceVisual(materialId: number, structure: Str
|
|
|
132
135
|
}>;
|
|
133
136
|
export declare function StructureGaussianSurfaceVisual(materialId: number, structure: Structure, props: PD.Values<StructureGaussianSurfaceMeshParams>, webgl?: WebGLContext): ComplexVisual<{
|
|
134
137
|
ignoreHydrogens: PD.BooleanParam;
|
|
138
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
135
139
|
tryUseGpu: PD.BooleanParam;
|
|
136
140
|
includeParent: PD.BooleanParam;
|
|
137
141
|
smoothColors: PD.Mapped<PD.NamedParams<PD.Normalize<unknown>, "auto"> | PD.NamedParams<PD.Normalize<{
|
|
@@ -24,7 +24,7 @@ var base_1 = require("../../../mol-geo/geometry/base");
|
|
|
24
24
|
var linear_algebra_1 = require("../../../mol-math/linear-algebra");
|
|
25
25
|
var debug_1 = require("../../../mol-util/debug");
|
|
26
26
|
var value_cell_1 = require("../../../mol-util/value-cell");
|
|
27
|
-
var SharedParams = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, gaussian_1.GaussianDensityParams), base_1.ColorSmoothingParams), { ignoreHydrogens: param_definition_1.ParamDefinition.Boolean(false), tryUseGpu: param_definition_1.ParamDefinition.Boolean(true), includeParent: param_definition_1.ParamDefinition.Boolean(false, { isHidden: true }) });
|
|
27
|
+
var SharedParams = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, gaussian_1.GaussianDensityParams), base_1.ColorSmoothingParams), { ignoreHydrogens: param_definition_1.ParamDefinition.Boolean(false), ignoreHydrogensVariant: param_definition_1.ParamDefinition.Select('all', param_definition_1.ParamDefinition.arrayToOptions(['all', 'non-polar'])), tryUseGpu: param_definition_1.ParamDefinition.Boolean(true), includeParent: param_definition_1.ParamDefinition.Boolean(false, { isHidden: true }) });
|
|
28
28
|
exports.GaussianSurfaceMeshParams = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, units_visual_1.UnitsMeshParams), units_visual_1.UnitsTextureMeshParams), SharedParams);
|
|
29
29
|
exports.StructureGaussianSurfaceMeshParams = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, complex_visual_1.ComplexMeshParams), complex_visual_1.ComplexTextureMeshParams), SharedParams);
|
|
30
30
|
function gpuSupport(webgl) {
|
|
@@ -106,6 +106,8 @@ function GaussianSurfaceMeshVisual(materialId) {
|
|
|
106
106
|
state.createGeometry = true;
|
|
107
107
|
if (newProps.ignoreHydrogens !== currentProps.ignoreHydrogens)
|
|
108
108
|
state.createGeometry = true;
|
|
109
|
+
if (newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant)
|
|
110
|
+
state.createGeometry = true;
|
|
109
111
|
if (newProps.traceOnly !== currentProps.traceOnly)
|
|
110
112
|
state.createGeometry = true;
|
|
111
113
|
if (newProps.includeParent !== currentProps.includeParent)
|
|
@@ -189,6 +191,8 @@ function StructureGaussianSurfaceMeshVisual(materialId) {
|
|
|
189
191
|
state.createGeometry = true;
|
|
190
192
|
if (newProps.ignoreHydrogens !== currentProps.ignoreHydrogens)
|
|
191
193
|
state.createGeometry = true;
|
|
194
|
+
if (newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant)
|
|
195
|
+
state.createGeometry = true;
|
|
192
196
|
if (newProps.traceOnly !== currentProps.traceOnly)
|
|
193
197
|
state.createGeometry = true;
|
|
194
198
|
if (newProps.smoothColors.name !== currentProps.smoothColors.name) {
|
|
@@ -274,6 +278,8 @@ function GaussianSurfaceTextureMeshVisual(materialId) {
|
|
|
274
278
|
state.createGeometry = true;
|
|
275
279
|
if (newProps.ignoreHydrogens !== currentProps.ignoreHydrogens)
|
|
276
280
|
state.createGeometry = true;
|
|
281
|
+
if (newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant)
|
|
282
|
+
state.createGeometry = true;
|
|
277
283
|
if (newProps.traceOnly !== currentProps.traceOnly)
|
|
278
284
|
state.createGeometry = true;
|
|
279
285
|
if (newProps.includeParent !== currentProps.includeParent)
|
|
@@ -364,6 +370,8 @@ function StructureGaussianSurfaceTextureMeshVisual(materialId) {
|
|
|
364
370
|
state.createGeometry = true;
|
|
365
371
|
if (newProps.ignoreHydrogens !== currentProps.ignoreHydrogens)
|
|
366
372
|
state.createGeometry = true;
|
|
373
|
+
if (newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant)
|
|
374
|
+
state.createGeometry = true;
|
|
367
375
|
if (newProps.traceOnly !== currentProps.traceOnly)
|
|
368
376
|
state.createGeometry = true;
|
|
369
377
|
if (newProps.includeParent !== currentProps.includeParent)
|
|
@@ -9,6 +9,7 @@ export declare const GaussianWireframeParams: {
|
|
|
9
9
|
sizeFactor: PD.Numeric;
|
|
10
10
|
lineSizeAttenuation: PD.BooleanParam;
|
|
11
11
|
ignoreHydrogens: PD.BooleanParam;
|
|
12
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
12
13
|
includeParent: PD.BooleanParam;
|
|
13
14
|
traceOnly: PD.BooleanParam;
|
|
14
15
|
resolution: PD.Numeric;
|
|
@@ -40,7 +40,7 @@ function createGaussianWireframe(ctx, unit, structure, theme, props, lines) {
|
|
|
40
40
|
});
|
|
41
41
|
});
|
|
42
42
|
}
|
|
43
|
-
exports.GaussianWireframeParams = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, units_visual_1.UnitsLinesParams), gaussian_1.GaussianDensityParams), { sizeFactor: param_definition_1.ParamDefinition.Numeric(3, { min: 0, max: 10, step: 0.1 }), lineSizeAttenuation: param_definition_1.ParamDefinition.Boolean(false), ignoreHydrogens: param_definition_1.ParamDefinition.Boolean(false), includeParent: param_definition_1.ParamDefinition.Boolean(false, { isHidden: true }) });
|
|
43
|
+
exports.GaussianWireframeParams = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, units_visual_1.UnitsLinesParams), gaussian_1.GaussianDensityParams), { sizeFactor: param_definition_1.ParamDefinition.Numeric(3, { min: 0, max: 10, step: 0.1 }), lineSizeAttenuation: param_definition_1.ParamDefinition.Boolean(false), ignoreHydrogens: param_definition_1.ParamDefinition.Boolean(false), ignoreHydrogensVariant: param_definition_1.ParamDefinition.Select('all', param_definition_1.ParamDefinition.arrayToOptions(['all', 'non-polar'])), includeParent: param_definition_1.ParamDefinition.Boolean(false, { isHidden: true }) });
|
|
44
44
|
function GaussianWireframeVisual(materialId) {
|
|
45
45
|
return (0, units_visual_1.UnitsLinesVisual)({
|
|
46
46
|
defaultProps: param_definition_1.ParamDefinition.getDefaultValues(exports.GaussianWireframeParams),
|
|
@@ -57,6 +57,8 @@ function GaussianWireframeVisual(materialId) {
|
|
|
57
57
|
state.createGeometry = true;
|
|
58
58
|
if (newProps.ignoreHydrogens !== currentProps.ignoreHydrogens)
|
|
59
59
|
state.createGeometry = true;
|
|
60
|
+
if (newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant)
|
|
61
|
+
state.createGeometry = true;
|
|
60
62
|
if (newProps.traceOnly !== currentProps.traceOnly)
|
|
61
63
|
state.createGeometry = true;
|
|
62
64
|
if (newProps.includeParent !== currentProps.includeParent)
|
|
@@ -12,6 +12,7 @@ export declare const MolecularSurfaceMeshParams: {
|
|
|
12
12
|
sampleStride: number;
|
|
13
13
|
}>, "on"> | PD.NamedParams<PD.Normalize<unknown>, "off">>;
|
|
14
14
|
ignoreHydrogens: PD.BooleanParam;
|
|
15
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
15
16
|
traceOnly: PD.BooleanParam;
|
|
16
17
|
includeParent: PD.BooleanParam;
|
|
17
18
|
probeRadius: PD.Numeric;
|
|
@@ -74,6 +74,8 @@ function MolecularSurfaceMeshVisual(materialId) {
|
|
|
74
74
|
state.createGeometry = true;
|
|
75
75
|
if (newProps.ignoreHydrogens !== currentProps.ignoreHydrogens)
|
|
76
76
|
state.createGeometry = true;
|
|
77
|
+
if (newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant)
|
|
78
|
+
state.createGeometry = true;
|
|
77
79
|
if (newProps.traceOnly !== currentProps.traceOnly)
|
|
78
80
|
state.createGeometry = true;
|
|
79
81
|
if (newProps.includeParent !== currentProps.includeParent)
|
|
@@ -156,6 +158,8 @@ function StructureMolecularSurfaceMeshVisual(materialId) {
|
|
|
156
158
|
state.createGeometry = true;
|
|
157
159
|
if (newProps.ignoreHydrogens !== currentProps.ignoreHydrogens)
|
|
158
160
|
state.createGeometry = true;
|
|
161
|
+
if (newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant)
|
|
162
|
+
state.createGeometry = true;
|
|
159
163
|
if (newProps.traceOnly !== currentProps.traceOnly)
|
|
160
164
|
state.createGeometry = true;
|
|
161
165
|
if (newProps.includeParent !== currentProps.includeParent)
|
|
@@ -8,6 +8,7 @@ import { UnitsVisual } from '../units-visual';
|
|
|
8
8
|
export declare const MolecularSurfaceWireframeParams: {
|
|
9
9
|
sizeFactor: PD.Numeric;
|
|
10
10
|
ignoreHydrogens: PD.BooleanParam;
|
|
11
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
11
12
|
traceOnly: PD.BooleanParam;
|
|
12
13
|
includeParent: PD.BooleanParam;
|
|
13
14
|
probeRadius: PD.Numeric;
|
|
@@ -58,6 +58,8 @@ function MolecularSurfaceWireframeVisual(materialId) {
|
|
|
58
58
|
state.createGeometry = true;
|
|
59
59
|
if (newProps.ignoreHydrogens !== currentProps.ignoreHydrogens)
|
|
60
60
|
state.createGeometry = true;
|
|
61
|
+
if (newProps.ignoreHydrogensVariant !== currentProps.ignoreHydrogensVariant)
|
|
62
|
+
state.createGeometry = true;
|
|
61
63
|
if (newProps.includeParent !== currentProps.includeParent)
|
|
62
64
|
state.createGeometry = true;
|
|
63
65
|
}
|
|
@@ -18,6 +18,7 @@ export declare const PolymerBackboneCylinderParams: {
|
|
|
18
18
|
ignoreLight: PD.BooleanParam;
|
|
19
19
|
xrayShaded: PD.BooleanParam;
|
|
20
20
|
transparentBackfaces: PD.Select<string>;
|
|
21
|
+
solidInterior: PD.BooleanParam;
|
|
21
22
|
bumpFrequency: PD.Numeric;
|
|
22
23
|
bumpAmplitude: PD.Numeric;
|
|
23
24
|
alpha: PD.Numeric;
|
|
@@ -53,6 +54,7 @@ export declare function PolymerBackboneCylinderVisual(materialId: number, struct
|
|
|
53
54
|
ignoreLight: PD.BooleanParam;
|
|
54
55
|
xrayShaded: PD.BooleanParam;
|
|
55
56
|
transparentBackfaces: PD.Select<string>;
|
|
57
|
+
solidInterior: PD.BooleanParam;
|
|
56
58
|
bumpFrequency: PD.Numeric;
|
|
57
59
|
bumpAmplitude: PD.Numeric;
|
|
58
60
|
alpha: PD.Numeric;
|
|
@@ -17,6 +17,7 @@ export declare const PolymerBackboneSphereParams: {
|
|
|
17
17
|
ignoreLight: PD.BooleanParam;
|
|
18
18
|
xrayShaded: PD.BooleanParam;
|
|
19
19
|
transparentBackfaces: PD.Select<string>;
|
|
20
|
+
solidInterior: PD.BooleanParam;
|
|
20
21
|
bumpFrequency: PD.Numeric;
|
|
21
22
|
bumpAmplitude: PD.Numeric;
|
|
22
23
|
alpha: PD.Numeric;
|
|
@@ -51,6 +52,7 @@ export declare function PolymerBackboneSphereVisual(materialId: number, structur
|
|
|
51
52
|
ignoreLight: PD.BooleanParam;
|
|
52
53
|
xrayShaded: PD.BooleanParam;
|
|
53
54
|
transparentBackfaces: PD.Select<string>;
|
|
55
|
+
solidInterior: PD.BooleanParam;
|
|
54
56
|
bumpFrequency: PD.Numeric;
|
|
55
57
|
bumpAmplitude: PD.Numeric;
|
|
56
58
|
alpha: PD.Numeric;
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
|
|
3
3
|
*
|
|
4
4
|
* @author Alexander Rose <alexander.rose@weirdbyte.de>
|
|
5
|
+
* @author David Sehnal <david.sehnal@gmail.com>
|
|
5
6
|
*/
|
|
6
7
|
import { BondType } from '../../../../mol-model/structure/model/types';
|
|
7
8
|
import { Unit, Structure, Bond } from '../../../../mol-model/structure';
|
|
@@ -15,6 +16,7 @@ export declare const BondParams: {
|
|
|
15
16
|
includeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
16
17
|
excludeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
17
18
|
ignoreHydrogens: PD.BooleanParam;
|
|
19
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
18
20
|
aromaticBonds: PD.BooleanParam;
|
|
19
21
|
multipleBonds: PD.Select<"offset" | "off" | "symmetric">;
|
|
20
22
|
};
|
|
@@ -22,6 +24,7 @@ export declare const DefaultBondProps: PD.Values<{
|
|
|
22
24
|
includeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
23
25
|
excludeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
24
26
|
ignoreHydrogens: PD.BooleanParam;
|
|
27
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
25
28
|
aromaticBonds: PD.BooleanParam;
|
|
26
29
|
multipleBonds: PD.Select<"offset" | "off" | "symmetric">;
|
|
27
30
|
}>;
|
|
@@ -31,6 +34,7 @@ export declare const BondCylinderParams: {
|
|
|
31
34
|
includeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
32
35
|
excludeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
33
36
|
ignoreHydrogens: PD.BooleanParam;
|
|
37
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
34
38
|
aromaticBonds: PD.BooleanParam;
|
|
35
39
|
multipleBonds: PD.Select<"offset" | "off" | "symmetric">;
|
|
36
40
|
linkScale: PD.Numeric;
|
|
@@ -50,6 +54,7 @@ export declare const DefaultBondCylinderProps: PD.Values<{
|
|
|
50
54
|
includeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
51
55
|
excludeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
52
56
|
ignoreHydrogens: PD.BooleanParam;
|
|
57
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
53
58
|
aromaticBonds: PD.BooleanParam;
|
|
54
59
|
multipleBonds: PD.Select<"offset" | "off" | "symmetric">;
|
|
55
60
|
linkScale: PD.Numeric;
|
|
@@ -69,6 +74,7 @@ export declare const BondLineParams: {
|
|
|
69
74
|
includeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
70
75
|
excludeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
71
76
|
ignoreHydrogens: PD.BooleanParam;
|
|
77
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
72
78
|
aromaticBonds: PD.BooleanParam;
|
|
73
79
|
multipleBonds: PD.Select<"offset" | "off" | "symmetric">;
|
|
74
80
|
linkScale: PD.Numeric;
|
|
@@ -80,6 +86,7 @@ export declare const DefaultBondLineProps: PD.Values<{
|
|
|
80
86
|
includeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
81
87
|
excludeTypes: PD.MultiSelect<"covalent" | "metal-coordination" | "hydrogen-bond" | "disulfide" | "aromatic" | "computed">;
|
|
82
88
|
ignoreHydrogens: PD.BooleanParam;
|
|
89
|
+
ignoreHydrogensVariant: PD.Select<"all" | "non-polar">;
|
|
83
90
|
aromaticBonds: PD.BooleanParam;
|
|
84
91
|
multipleBonds: PD.Select<"offset" | "off" | "symmetric">;
|
|
85
92
|
linkScale: PD.Numeric;
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
* Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
|
|
4
4
|
*
|
|
5
5
|
* @author Alexander Rose <alexander.rose@weirdbyte.de>
|
|
6
|
+
* @author David Sehnal <david.sehnal@gmail.com>
|
|
6
7
|
*/
|
|
7
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
9
|
exports.eachInterBond = exports.getInterBondLoci = exports.eachIntraBond = exports.getIntraBondLoci = exports.BondIterator = exports.makeInterBondIgnoreTest = exports.makeIntraBondIgnoreTest = exports.ignoreBondType = exports.DefaultBondLineProps = exports.BondLineParams = exports.DefaultBondCylinderProps = exports.BondCylinderParams = exports.DefaultBondProps = exports.BondParams = void 0;
|
|
@@ -20,6 +21,7 @@ exports.BondParams = {
|
|
|
20
21
|
includeTypes: param_definition_1.ParamDefinition.MultiSelect((0, type_helpers_1.ObjectKeys)(types_1.BondType.Names), param_definition_1.ParamDefinition.objectToOptions(types_1.BondType.Names)),
|
|
21
22
|
excludeTypes: param_definition_1.ParamDefinition.MultiSelect([], param_definition_1.ParamDefinition.objectToOptions(types_1.BondType.Names)),
|
|
22
23
|
ignoreHydrogens: param_definition_1.ParamDefinition.Boolean(false),
|
|
24
|
+
ignoreHydrogensVariant: param_definition_1.ParamDefinition.Select('all', param_definition_1.ParamDefinition.arrayToOptions(['all', 'non-polar'])),
|
|
23
25
|
aromaticBonds: param_definition_1.ParamDefinition.Boolean(true, { description: 'Display aromatic bonds with dashes' }),
|
|
24
26
|
multipleBonds: param_definition_1.ParamDefinition.Select('symmetric', param_definition_1.ParamDefinition.arrayToOptions(['off', 'symmetric', 'offset'])),
|
|
25
27
|
};
|
|
@@ -34,11 +36,10 @@ function ignoreBondType(include, exclude, f) {
|
|
|
34
36
|
exports.ignoreBondType = ignoreBondType;
|
|
35
37
|
function makeIntraBondIgnoreTest(structure, unit, props) {
|
|
36
38
|
var elements = unit.elements;
|
|
37
|
-
var atomicNumber = unit.model.atomicHierarchy.derived.atom.atomicNumber;
|
|
38
39
|
var bonds = unit.bonds;
|
|
39
40
|
var a = bonds.a, b = bonds.b, edgeProps = bonds.edgeProps;
|
|
40
41
|
var _flags = edgeProps.flags;
|
|
41
|
-
var ignoreHydrogens = props.ignoreHydrogens, includeTypes = props.includeTypes, excludeTypes = props.excludeTypes;
|
|
42
|
+
var ignoreHydrogens = props.ignoreHydrogens, ignoreHydrogensVariant = props.ignoreHydrogensVariant, includeTypes = props.includeTypes, excludeTypes = props.excludeTypes;
|
|
42
43
|
var include = types_1.BondType.fromNames(includeTypes);
|
|
43
44
|
var exclude = types_1.BondType.fromNames(excludeTypes);
|
|
44
45
|
var allBondTypes = types_1.BondType.isAll(include) && 0 /* BondType.Flag.None */ === exclude;
|
|
@@ -49,16 +50,26 @@ function makeIntraBondIgnoreTest(structure, unit, props) {
|
|
|
49
50
|
if (allBondTypes && !ignoreHydrogens && !child)
|
|
50
51
|
return;
|
|
51
52
|
return function (edgeIndex) {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
53
|
+
var aI = a[edgeIndex];
|
|
54
|
+
var bI = b[edgeIndex];
|
|
55
|
+
if ((!!childUnit && !int_1.SortedArray.has(childUnit.elements, elements[aI]))) {
|
|
56
|
+
return true;
|
|
57
|
+
}
|
|
58
|
+
if (!allBondTypes && ignoreBondType(include, exclude, _flags[edgeIndex])) {
|
|
59
|
+
return true;
|
|
60
|
+
}
|
|
61
|
+
if (!ignoreHydrogens)
|
|
62
|
+
return false;
|
|
63
|
+
if ((0, common_1.isHydrogen)(structure, unit, elements[aI], ignoreHydrogensVariant) || (0, common_1.isHydrogen)(structure, unit, elements[bI], ignoreHydrogensVariant))
|
|
64
|
+
return true;
|
|
65
|
+
return false;
|
|
55
66
|
};
|
|
56
67
|
}
|
|
57
68
|
exports.makeIntraBondIgnoreTest = makeIntraBondIgnoreTest;
|
|
58
69
|
function makeInterBondIgnoreTest(structure, props) {
|
|
59
70
|
var bonds = structure.interUnitBonds;
|
|
60
71
|
var edges = bonds.edges;
|
|
61
|
-
var ignoreHydrogens = props.ignoreHydrogens, includeTypes = props.includeTypes, excludeTypes = props.excludeTypes;
|
|
72
|
+
var ignoreHydrogens = props.ignoreHydrogens, ignoreHydrogensVariant = props.ignoreHydrogensVariant, includeTypes = props.includeTypes, excludeTypes = props.excludeTypes;
|
|
62
73
|
var include = types_1.BondType.fromNames(includeTypes);
|
|
63
74
|
var exclude = types_1.BondType.fromNames(excludeTypes);
|
|
64
75
|
var allBondTypes = types_1.BondType.isAll(include) && 0 /* BondType.Flag.None */ === exclude;
|
|
@@ -80,7 +91,7 @@ function makeInterBondIgnoreTest(structure, props) {
|
|
|
80
91
|
var b = edges[edgeIndex];
|
|
81
92
|
var uA = structure.unitMap.get(b.unitA);
|
|
82
93
|
var uB = structure.unitMap.get(b.unitB);
|
|
83
|
-
if ((0, common_1.isHydrogen)(uA, uA.elements[b.indexA]) || (0, common_1.isHydrogen)(uB, uB.elements[b.indexB]))
|
|
94
|
+
if ((0, common_1.isHydrogen)(structure, uA, uA.elements[b.indexA], ignoreHydrogensVariant) || (0, common_1.isHydrogen)(structure, uB, uB.elements[b.indexB], ignoreHydrogensVariant))
|
|
84
95
|
return true;
|
|
85
96
|
}
|
|
86
97
|
if (!allBondTypes) {
|