molstar 3.8.2 → 3.9.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/build/viewer/index.html +4 -1
- package/build/viewer/molstar.js +1 -1
- package/lib/apps/viewer/app.d.ts +1 -1
- package/lib/apps/viewer/app.js +1 -1
- package/lib/apps/viewer/index.html +4 -1
- package/lib/cli/cif2bcif/converter.js +1 -1
- package/lib/commonjs/apps/viewer/app.d.ts +1 -1
- package/lib/commonjs/apps/viewer/app.js +2 -1
- package/lib/commonjs/cli/cif2bcif/converter.js +1 -1
- package/lib/commonjs/examples/alpha-orbitals/index.d.ts +1 -1
- package/lib/commonjs/examples/alpha-orbitals/index.js +4 -1
- package/lib/commonjs/examples/basic-wrapper/custom-theme.js +1 -1
- package/lib/commonjs/examples/proteopedia-wrapper/coloring.js +3 -3
- package/lib/commonjs/extensions/alpha-orbitals/density.d.ts +1 -1
- package/lib/commonjs/extensions/alpha-orbitals/density.js +6 -2
- package/lib/commonjs/extensions/alpha-orbitals/orbitals.d.ts +1 -1
- package/lib/commonjs/extensions/alpha-orbitals/orbitals.js +6 -3
- package/lib/commonjs/extensions/anvil/algorithm.js +1 -1
- package/lib/commonjs/extensions/cellpack/color/generate.js +1 -1
- package/lib/commonjs/extensions/cellpack/color/provided.js +1 -1
- package/lib/commonjs/extensions/cellpack/state.js +1 -1
- package/lib/commonjs/extensions/dnatco/confal-pyramids/color.js +1 -1
- package/lib/commonjs/extensions/g3d/model.js +1 -1
- package/lib/commonjs/extensions/model-archive/quality-assessment/color/plddt.js +1 -1
- package/lib/commonjs/extensions/model-archive/quality-assessment/color/qmean.js +1 -1
- package/lib/commonjs/extensions/pdbe/structure-quality-report/color.js +1 -1
- package/lib/commonjs/extensions/rcsb/assembly-symmetry/color.js +4 -4
- package/lib/commonjs/extensions/rcsb/validation-report/color/density-fit.js +1 -1
- package/lib/commonjs/extensions/rcsb/validation-report/color/geometry-quality.js +2 -2
- package/lib/commonjs/extensions/rcsb/validation-report/color/random-coil-index.js +1 -1
- package/lib/commonjs/extensions/rcsb/validation-report/representation.js +2 -2
- package/lib/commonjs/mol-canvas3d/canvas3d.js +4 -0
- package/lib/commonjs/mol-canvas3d/controls/trackball.js +7 -7
- package/lib/commonjs/mol-canvas3d/helper/camera-helper.js +14 -14
- package/lib/commonjs/mol-canvas3d/helper/interaction-events.js +5 -5
- package/lib/commonjs/mol-canvas3d/passes/draw.js +34 -5
- package/lib/commonjs/mol-canvas3d/passes/fxaa.js +5 -0
- package/lib/commonjs/mol-canvas3d/passes/marking.js +5 -0
- package/lib/commonjs/mol-canvas3d/passes/multi-sample.js +9 -0
- package/lib/commonjs/mol-canvas3d/passes/pick.d.ts +18 -5
- package/lib/commonjs/mol-canvas3d/passes/pick.js +125 -24
- package/lib/commonjs/mol-canvas3d/passes/postprocessing.js +5 -0
- package/lib/commonjs/mol-canvas3d/passes/smaa.js +4 -0
- package/lib/commonjs/mol-canvas3d/passes/wboit.js +4 -0
- package/lib/commonjs/mol-data/db/column.js +5 -5
- package/lib/commonjs/mol-data/db/table.js +2 -2
- package/lib/commonjs/mol-data/util/array.d.ts +1 -1
- package/lib/commonjs/mol-geo/geometry/texture-mesh/color-smoothing.js +13 -0
- package/lib/commonjs/mol-gl/compute/grid3d.d.ts +2 -2
- package/lib/commonjs/mol-gl/compute/grid3d.js +30 -8
- package/lib/commonjs/mol-gl/compute/histogram-pyramid/reduction.d.ts +1 -1
- package/lib/commonjs/mol-gl/compute/histogram-pyramid/reduction.js +6 -1
- package/lib/commonjs/mol-gl/compute/histogram-pyramid/sum.d.ts +1 -1
- package/lib/commonjs/mol-gl/compute/histogram-pyramid/sum.js +6 -1
- package/lib/commonjs/mol-gl/compute/marching-cubes/active-voxels.d.ts +1 -1
- package/lib/commonjs/mol-gl/compute/marching-cubes/active-voxels.js +6 -1
- package/lib/commonjs/mol-gl/compute/marching-cubes/isosurface.d.ts +1 -1
- package/lib/commonjs/mol-gl/compute/marching-cubes/isosurface.js +10 -10
- package/lib/commonjs/mol-gl/renderer.js +77 -32
- package/lib/commonjs/mol-gl/scene.js +2 -0
- package/lib/commonjs/mol-gl/shader/chunks/assign-color-varying.glsl.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader/chunks/assign-color-varying.glsl.js +1 -1
- package/lib/commonjs/mol-gl/shader/chunks/assign-material-color.glsl.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader/chunks/assign-material-color.glsl.js +1 -1
- package/lib/commonjs/mol-gl/shader/chunks/color-frag-params.glsl.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader/chunks/color-frag-params.glsl.js +1 -1
- package/lib/commonjs/mol-gl/shader/chunks/color-vert-params.glsl.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader/chunks/color-vert-params.glsl.js +1 -1
- 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/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/image.frag.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader/image.frag.js +1 -1
- package/lib/commonjs/mol-gl/shader/lines.frag.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader/lines.frag.js +1 -1
- package/lib/commonjs/mol-gl/shader/mesh.frag.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader/mesh.frag.js +1 -1
- package/lib/commonjs/mol-gl/shader/points.frag.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader/points.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/text.frag.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader/text.frag.js +1 -1
- package/lib/commonjs/mol-gl/shader-code.d.ts +1 -1
- package/lib/commonjs/mol-gl/shader-code.js +41 -9
- package/lib/commonjs/mol-gl/webgl/compat.d.ts +34 -1
- package/lib/commonjs/mol-gl/webgl/compat.js +50 -2
- package/lib/commonjs/mol-gl/webgl/context.d.ts +2 -0
- package/lib/commonjs/mol-gl/webgl/context.js +3 -0
- package/lib/commonjs/mol-gl/webgl/extensions.d.ts +3 -2
- package/lib/commonjs/mol-gl/webgl/extensions.js +6 -1
- package/lib/commonjs/mol-gl/webgl/timer.d.ts +22 -0
- package/lib/commonjs/mol-gl/webgl/timer.js +169 -0
- package/lib/commonjs/mol-io/common/binary-cif/array-encoder.js +18 -18
- package/lib/commonjs/mol-io/common/binary-cif/decoder.js +16 -16
- package/lib/commonjs/mol-io/common/binary-cif/encoding.js +9 -9
- package/lib/commonjs/mol-io/reader/cif/binary/field.js +3 -3
- package/lib/commonjs/mol-io/reader/cif/data-model.js +14 -14
- package/lib/commonjs/mol-io/reader/cif/schema.js +1 -1
- package/lib/commonjs/mol-io/reader/cif/text/parser.js +23 -23
- package/lib/commonjs/mol-io/reader/common/text/column/fixed.js +1 -1
- package/lib/commonjs/mol-io/reader/common/text/column/token.js +1 -1
- package/lib/commonjs/mol-io/reader/common/text/number-parser.js +6 -6
- package/lib/commonjs/mol-io/reader/csv/parser.js +8 -8
- package/lib/commonjs/mol-io/writer/cif/encoder/binary.js +10 -10
- package/lib/commonjs/mol-io/writer/cif/encoder/text.js +7 -7
- package/lib/commonjs/mol-io/writer/cif/encoder.js +8 -8
- package/lib/commonjs/mol-io/writer/mol2/encoder.js +4 -4
- package/lib/commonjs/mol-math/geometry/gaussian-density/gpu.js +13 -2
- package/lib/commonjs/mol-model/sequence/alignment/sequence.js +3 -3
- package/lib/commonjs/mol-model/sequence/sequence.js +9 -9
- package/lib/commonjs/mol-model/structure/export/categories/atom_site_operator_mapping.js +3 -3
- package/lib/commonjs/mol-model/structure/export/categories/secondary-structure.js +2 -2
- package/lib/commonjs/mol-model/structure/export/categories/utils.js +1 -1
- package/lib/commonjs/mol-model/structure/model/model.js +2 -2
- package/lib/commonjs/mol-model/structure/model/properties/custom/indexed.js +6 -6
- package/lib/commonjs/mol-model/structure/model/properties/utils/atomic-ranges.js +1 -1
- package/lib/commonjs/mol-model/structure/model/types.js +116 -116
- package/lib/commonjs/mol-model/structure/query/context.js +1 -1
- package/lib/commonjs/mol-model/structure/query/queries/generators.js +5 -5
- package/lib/commonjs/mol-model/structure/query/queries/internal.js +4 -4
- package/lib/commonjs/mol-model/structure/query/queries/modifiers.js +4 -4
- package/lib/commonjs/mol-model/structure/query/utils/structure-distance.d.ts +5 -54
- package/lib/commonjs/mol-model/structure/query/utils/structure-distance.js +9 -9
- package/lib/commonjs/mol-model/structure/structure/carbohydrates/constants.js +106 -106
- package/lib/commonjs/mol-model/structure/structure/element/loci.js +5 -5
- package/lib/commonjs/mol-model/structure/structure/element/stats.js +5 -5
- package/lib/commonjs/mol-model/structure/structure/properties.js +5 -5
- package/lib/commonjs/mol-model/structure/structure/structure.js +11 -11
- package/lib/commonjs/mol-model/structure/structure/unit/bonds/inter-compute.js +5 -5
- package/lib/commonjs/mol-model/structure/structure/unit/bonds/intra-compute.js +4 -4
- package/lib/commonjs/mol-model/structure/structure/unit/bonds.js +2 -2
- package/lib/commonjs/mol-model/structure/structure/unit/resonance.js +1 -1
- package/lib/commonjs/mol-model/structure/structure/unit/rings/compute.js +6 -6
- package/lib/commonjs/mol-model/structure/structure/unit/rings.js +6 -6
- package/lib/commonjs/mol-model/structure/structure/unit.js +16 -16
- package/lib/commonjs/mol-model/structure/structure/util/superposition-sifts-mapping.js +1 -1
- package/lib/commonjs/mol-model/structure/util.js +4 -4
- package/lib/commonjs/mol-model-formats/structure/basic/atomic.js +2 -2
- package/lib/commonjs/mol-model-formats/structure/basic/parser.js +4 -4
- package/lib/commonjs/mol-model-formats/structure/basic/properties.js +1 -1
- package/lib/commonjs/mol-model-formats/structure/basic/sort.js +1 -1
- package/lib/commonjs/mol-model-formats/structure/basic/util.js +1 -1
- package/lib/commonjs/mol-model-formats/structure/cif-core.js +6 -6
- package/lib/commonjs/mol-model-formats/structure/common/entity.js +1 -1
- package/lib/commonjs/mol-model-formats/structure/cube.js +1 -1
- package/lib/commonjs/mol-model-formats/structure/gro.js +1 -1
- package/lib/commonjs/mol-model-formats/structure/mol.js +1 -1
- package/lib/commonjs/mol-model-formats/structure/mol2.js +4 -4
- package/lib/commonjs/mol-model-formats/structure/prmtop.js +1 -1
- package/lib/commonjs/mol-model-formats/structure/property/bonds/chem_comp.js +3 -3
- package/lib/commonjs/mol-model-formats/structure/property/bonds/index-pair.js +1 -1
- package/lib/commonjs/mol-model-formats/structure/property/bonds/struct_conn.js +6 -6
- package/lib/commonjs/mol-model-formats/structure/property/secondary-structure.js +8 -8
- package/lib/commonjs/mol-model-formats/structure/psf.js +1 -1
- package/lib/commonjs/mol-model-formats/structure/top.js +1 -1
- package/lib/commonjs/mol-model-formats/structure/xyz.js +1 -1
- package/lib/commonjs/mol-model-props/computed/accessible-surface-area/shrake-rupley/radii.js +2 -2
- package/lib/commonjs/mol-model-props/computed/accessible-surface-area/shrake-rupley.js +3 -3
- package/lib/commonjs/mol-model-props/computed/accessible-surface-area.js +2 -2
- package/lib/commonjs/mol-model-props/computed/chemistry/functional-group.js +31 -31
- package/lib/commonjs/mol-model-props/computed/chemistry/geometry.js +22 -22
- package/lib/commonjs/mol-model-props/computed/chemistry/valence-model.js +32 -32
- package/lib/commonjs/mol-model-props/computed/interactions/charged.js +39 -39
- package/lib/commonjs/mol-model-props/computed/interactions/common.js +34 -34
- package/lib/commonjs/mol-model-props/computed/interactions/contacts-builder.js +1 -1
- package/lib/commonjs/mol-model-props/computed/interactions/contacts.js +1 -1
- package/lib/commonjs/mol-model-props/computed/interactions/halogen-bonds.js +12 -12
- package/lib/commonjs/mol-model-props/computed/interactions/hydrogen-bonds.js +32 -32
- package/lib/commonjs/mol-model-props/computed/interactions/hydrophobic.js +9 -9
- package/lib/commonjs/mol-model-props/computed/interactions/metal.js +26 -26
- package/lib/commonjs/mol-model-props/computed/interactions/refine.js +20 -20
- package/lib/commonjs/mol-model-props/computed/representations/interactions-inter-unit-cylinder.js +2 -2
- package/lib/commonjs/mol-model-props/computed/representations/interactions-intra-unit-cylinder.js +2 -2
- package/lib/commonjs/mol-model-props/computed/secondary-structure/dssp/bends.js +1 -1
- package/lib/commonjs/mol-model-props/computed/secondary-structure/dssp/bridges.js +12 -12
- package/lib/commonjs/mol-model-props/computed/secondary-structure/dssp/helices.js +6 -6
- package/lib/commonjs/mol-model-props/computed/secondary-structure/dssp/ladders.js +3 -3
- package/lib/commonjs/mol-model-props/computed/secondary-structure/dssp/sheets.js +11 -11
- package/lib/commonjs/mol-model-props/computed/secondary-structure/dssp/turns.js +3 -3
- package/lib/commonjs/mol-model-props/computed/secondary-structure/dssp.js +30 -30
- package/lib/commonjs/mol-model-props/computed/themes/accessible-surface-area.js +1 -1
- package/lib/commonjs/mol-model-props/computed/themes/interaction-type.js +10 -10
- package/lib/commonjs/mol-model-props/integrative/cross-link-restraint/color.js +1 -1
- package/lib/commonjs/mol-model-props/integrative/cross-link-restraint/format.js +3 -3
- package/lib/commonjs/mol-model-props/sequence/sifts-mapping.js +1 -1
- package/lib/commonjs/mol-model-props/sequence/themes/sifts-mapping.js +1 -1
- package/lib/commonjs/mol-plugin/animation-loop.d.ts +2 -1
- package/lib/commonjs/mol-plugin/animation-loop.js +18 -5
- package/lib/commonjs/mol-plugin/behavior/dynamic/camera.js +12 -12
- package/lib/commonjs/mol-plugin/behavior/dynamic/representation.js +7 -7
- package/lib/commonjs/mol-plugin/context.d.ts +2 -2
- package/lib/commonjs/mol-plugin/state.d.ts +1 -14
- package/lib/commonjs/mol-plugin-state/formats/volume.d.ts +12 -11
- package/lib/commonjs/mol-plugin-state/formats/volume.js +20 -13
- package/lib/commonjs/mol-plugin-state/helpers/structure-selection-query.js +5 -5
- package/lib/commonjs/mol-plugin-state/transforms/representation.js +2 -2
- package/lib/commonjs/mol-plugin-ui/controls/parameters.d.ts +1 -1
- package/lib/commonjs/mol-plugin-ui/sequence/polymer.js +1 -1
- package/lib/commonjs/mol-plugin-ui/sequence/sequence.js +1 -1
- package/lib/commonjs/mol-plugin-ui/structure/focus.js +1 -1
- package/lib/commonjs/mol-plugin-ui/viewport.d.ts +2 -2
- package/lib/commonjs/mol-repr/structure/visual/bond-inter-unit-cylinder.js +10 -10
- package/lib/commonjs/mol-repr/structure/visual/bond-inter-unit-line.js +10 -10
- package/lib/commonjs/mol-repr/structure/visual/bond-intra-unit-cylinder.js +12 -12
- package/lib/commonjs/mol-repr/structure/visual/bond-intra-unit-line.js +12 -12
- package/lib/commonjs/mol-repr/structure/visual/carbohydrate-symbol-mesh.js +16 -16
- package/lib/commonjs/mol-repr/structure/visual/carbohydrate-terminal-link-cylinder.js +1 -1
- package/lib/commonjs/mol-repr/structure/visual/gaussian-surface-mesh.js +9 -0
- package/lib/commonjs/mol-repr/structure/visual/orientation-ellipsoid-mesh.js +4 -4
- package/lib/commonjs/mol-repr/structure/visual/polymer-direction-wedge.js +1 -1
- package/lib/commonjs/mol-repr/structure/visual/polymer-trace-mesh.js +2 -2
- package/lib/commonjs/mol-repr/structure/visual/util/bond.js +2 -2
- package/lib/commonjs/mol-repr/structure/visual/util/common.js +3 -3
- package/lib/commonjs/mol-repr/structure/visual/util/link.js +30 -30
- package/lib/commonjs/mol-repr/structure/visual/util/polymer/backbone.js +6 -6
- package/lib/commonjs/mol-repr/structure/visual/util/polymer/gap-iterator.js +3 -3
- package/lib/commonjs/mol-repr/structure/visual/util/polymer/trace-iterator.js +20 -20
- package/lib/commonjs/mol-repr/structure/visual/util/polymer.js +6 -6
- package/lib/commonjs/mol-script/language/symbol-table/core.d.ts +2 -2
- package/lib/commonjs/mol-script/runtime/query/table.js +13 -13
- package/lib/commonjs/mol-state/object.d.ts +3 -3
- package/lib/commonjs/mol-task/util/user-timing.js +1 -1
- package/lib/commonjs/mol-theme/clipping.js +19 -19
- package/lib/commonjs/mol-theme/color/atom-id.js +1 -1
- package/lib/commonjs/mol-theme/color/carbohydrate-symbol.js +1 -1
- package/lib/commonjs/mol-theme/color/chain-id.js +4 -4
- package/lib/commonjs/mol-theme/color/element-index.js +1 -1
- package/lib/commonjs/mol-theme/color/element-symbol.js +1 -1
- package/lib/commonjs/mol-theme/color/entity-id.js +4 -4
- package/lib/commonjs/mol-theme/color/entity-source.js +5 -4
- package/lib/commonjs/mol-theme/color/hydrophobicity.js +1 -1
- package/lib/commonjs/mol-theme/color/illustrative.js +1 -1
- package/lib/commonjs/mol-theme/color/model-index.js +1 -1
- package/lib/commonjs/mol-theme/color/molecule-type.js +8 -8
- package/lib/commonjs/mol-theme/color/occupancy.js +1 -1
- package/lib/commonjs/mol-theme/color/operator-hkl.js +1 -1
- package/lib/commonjs/mol-theme/color/operator-name.js +1 -1
- package/lib/commonjs/mol-theme/color/partial-charge.js +1 -1
- package/lib/commonjs/mol-theme/color/polymer-id.js +4 -4
- package/lib/commonjs/mol-theme/color/polymer-index.js +1 -1
- package/lib/commonjs/mol-theme/color/residue-name.js +1 -1
- package/lib/commonjs/mol-theme/color/secondary-structure.js +12 -12
- package/lib/commonjs/mol-theme/color/sequence-id.js +7 -7
- package/lib/commonjs/mol-theme/color/shape-group.js +1 -1
- package/lib/commonjs/mol-theme/color/uncertainty.js +1 -1
- package/lib/commonjs/mol-theme/color/uniform.js +1 -1
- package/lib/commonjs/mol-theme/color/unit-index.js +1 -1
- package/lib/commonjs/mol-theme/color/volume-value.js +1 -1
- package/lib/commonjs/mol-theme/label.js +3 -3
- package/lib/commonjs/mol-util/binding.js +4 -4
- package/lib/commonjs/mol-util/debug.d.ts +6 -1
- package/lib/commonjs/mol-util/debug.js +11 -1
- package/lib/commonjs/mol-util/input/input-observer.js +20 -20
- package/lib/commonjs/mol-util/string-builder.js +1 -1
- package/lib/commonjs/servers/model/preprocess/converter.js +1 -1
- package/lib/commonjs/servers/model/server/query.js +1 -1
- package/lib/commonjs/servers/model/utils/fetch-retry.js +3 -2
- package/lib/commonjs/servers/volume/server/algebra/coordinate.js +6 -6
- package/lib/commonjs/servers/volume/server/query/encode.js +1 -1
- package/lib/examples/alpha-orbitals/index.d.ts +1 -1
- package/lib/examples/alpha-orbitals/index.html +11 -0
- package/lib/examples/alpha-orbitals/index.js +4 -1
- package/lib/examples/basic-wrapper/custom-theme.js +1 -1
- package/lib/examples/proteopedia-wrapper/coloring.js +3 -3
- package/lib/extensions/alpha-orbitals/density.d.ts +1 -1
- package/lib/extensions/alpha-orbitals/density.js +6 -2
- package/lib/extensions/alpha-orbitals/orbitals.d.ts +1 -1
- package/lib/extensions/alpha-orbitals/orbitals.js +6 -3
- package/lib/extensions/anvil/algorithm.js +1 -1
- package/lib/extensions/cellpack/color/generate.js +1 -1
- package/lib/extensions/cellpack/color/provided.js +1 -1
- package/lib/extensions/cellpack/state.js +1 -1
- package/lib/extensions/dnatco/confal-pyramids/color.js +1 -1
- package/lib/extensions/g3d/model.js +1 -1
- package/lib/extensions/model-archive/quality-assessment/color/plddt.js +1 -1
- package/lib/extensions/model-archive/quality-assessment/color/qmean.js +1 -1
- package/lib/extensions/pdbe/structure-quality-report/color.js +1 -1
- package/lib/extensions/rcsb/assembly-symmetry/color.js +4 -4
- package/lib/extensions/rcsb/validation-report/color/density-fit.js +1 -1
- package/lib/extensions/rcsb/validation-report/color/geometry-quality.js +2 -2
- package/lib/extensions/rcsb/validation-report/color/random-coil-index.js +1 -1
- package/lib/extensions/rcsb/validation-report/representation.js +2 -2
- package/lib/mol-canvas3d/canvas3d.js +5 -1
- package/lib/mol-canvas3d/controls/trackball.js +7 -7
- package/lib/mol-canvas3d/helper/camera-helper.js +14 -14
- package/lib/mol-canvas3d/helper/interaction-events.js +5 -5
- package/lib/mol-canvas3d/passes/draw.js +34 -5
- package/lib/mol-canvas3d/passes/fxaa.js +5 -0
- package/lib/mol-canvas3d/passes/marking.js +5 -0
- package/lib/mol-canvas3d/passes/multi-sample.js +9 -0
- package/lib/mol-canvas3d/passes/pick.d.ts +18 -5
- package/lib/mol-canvas3d/passes/pick.js +125 -24
- package/lib/mol-canvas3d/passes/postprocessing.js +5 -0
- package/lib/mol-canvas3d/passes/smaa.js +5 -1
- package/lib/mol-canvas3d/passes/wboit.js +5 -1
- package/lib/mol-data/db/column.js +5 -5
- package/lib/mol-data/db/table.js +2 -2
- package/lib/mol-data/util/array.d.ts +1 -1
- package/lib/mol-geo/geometry/texture-mesh/color-smoothing.js +13 -0
- package/lib/mol-gl/compute/grid3d.d.ts +2 -2
- package/lib/mol-gl/compute/grid3d.js +30 -8
- package/lib/mol-gl/compute/histogram-pyramid/reduction.d.ts +1 -1
- package/lib/mol-gl/compute/histogram-pyramid/reduction.js +6 -1
- package/lib/mol-gl/compute/histogram-pyramid/sum.d.ts +1 -1
- package/lib/mol-gl/compute/histogram-pyramid/sum.js +6 -1
- package/lib/mol-gl/compute/marching-cubes/active-voxels.d.ts +1 -1
- package/lib/mol-gl/compute/marching-cubes/active-voxels.js +6 -1
- package/lib/mol-gl/compute/marching-cubes/isosurface.d.ts +1 -1
- package/lib/mol-gl/compute/marching-cubes/isosurface.js +10 -10
- package/lib/mol-gl/renderer.js +77 -32
- package/lib/mol-gl/scene.js +2 -0
- package/lib/mol-gl/shader/chunks/assign-color-varying.glsl.d.ts +1 -1
- package/lib/mol-gl/shader/chunks/assign-color-varying.glsl.js +1 -1
- package/lib/mol-gl/shader/chunks/assign-material-color.glsl.d.ts +1 -1
- package/lib/mol-gl/shader/chunks/assign-material-color.glsl.js +1 -1
- package/lib/mol-gl/shader/chunks/color-frag-params.glsl.d.ts +1 -1
- package/lib/mol-gl/shader/chunks/color-frag-params.glsl.js +1 -1
- package/lib/mol-gl/shader/chunks/color-vert-params.glsl.d.ts +1 -1
- package/lib/mol-gl/shader/chunks/color-vert-params.glsl.js +1 -1
- 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/direct-volume.frag.d.ts +1 -1
- package/lib/mol-gl/shader/direct-volume.frag.js +1 -1
- package/lib/mol-gl/shader/image.frag.d.ts +1 -1
- package/lib/mol-gl/shader/image.frag.js +1 -1
- package/lib/mol-gl/shader/lines.frag.d.ts +1 -1
- package/lib/mol-gl/shader/lines.frag.js +1 -1
- package/lib/mol-gl/shader/mesh.frag.d.ts +1 -1
- package/lib/mol-gl/shader/mesh.frag.js +1 -1
- package/lib/mol-gl/shader/points.frag.d.ts +1 -1
- package/lib/mol-gl/shader/points.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/text.frag.d.ts +1 -1
- package/lib/mol-gl/shader/text.frag.js +1 -1
- package/lib/mol-gl/shader-code.d.ts +1 -1
- package/lib/mol-gl/shader-code.js +41 -9
- package/lib/mol-gl/webgl/compat.d.ts +34 -1
- package/lib/mol-gl/webgl/compat.js +48 -1
- package/lib/mol-gl/webgl/context.d.ts +2 -0
- package/lib/mol-gl/webgl/context.js +3 -0
- package/lib/mol-gl/webgl/extensions.d.ts +3 -2
- package/lib/mol-gl/webgl/extensions.js +7 -2
- package/lib/mol-gl/webgl/timer.d.ts +22 -0
- package/lib/mol-gl/webgl/timer.js +164 -0
- package/lib/mol-io/common/binary-cif/array-encoder.js +18 -18
- package/lib/mol-io/common/binary-cif/decoder.js +16 -16
- package/lib/mol-io/common/binary-cif/encoding.js +9 -9
- package/lib/mol-io/reader/cif/binary/field.js +3 -3
- package/lib/mol-io/reader/cif/data-model.js +14 -14
- package/lib/mol-io/reader/cif/schema.js +1 -1
- package/lib/mol-io/reader/cif/text/parser.js +23 -23
- package/lib/mol-io/reader/common/text/column/fixed.js +1 -1
- package/lib/mol-io/reader/common/text/column/token.js +1 -1
- package/lib/mol-io/reader/common/text/number-parser.js +6 -6
- package/lib/mol-io/reader/csv/parser.js +8 -8
- package/lib/mol-io/writer/cif/encoder/binary.js +10 -10
- package/lib/mol-io/writer/cif/encoder/text.js +7 -7
- package/lib/mol-io/writer/cif/encoder.js +8 -8
- package/lib/mol-io/writer/mol2/encoder.js +4 -4
- package/lib/mol-math/geometry/gaussian-density/gpu.js +13 -2
- package/lib/mol-model/sequence/alignment/sequence.js +3 -3
- package/lib/mol-model/sequence/sequence.js +9 -9
- package/lib/mol-model/structure/export/categories/atom_site_operator_mapping.js +3 -3
- package/lib/mol-model/structure/export/categories/secondary-structure.js +2 -2
- package/lib/mol-model/structure/export/categories/utils.js +1 -1
- package/lib/mol-model/structure/model/model.js +2 -2
- package/lib/mol-model/structure/model/properties/custom/indexed.js +6 -6
- package/lib/mol-model/structure/model/properties/utils/atomic-ranges.js +1 -1
- package/lib/mol-model/structure/model/types.js +116 -116
- package/lib/mol-model/structure/query/context.js +1 -1
- package/lib/mol-model/structure/query/queries/generators.js +5 -5
- package/lib/mol-model/structure/query/queries/internal.js +4 -4
- package/lib/mol-model/structure/query/queries/modifiers.js +4 -4
- package/lib/mol-model/structure/query/utils/structure-distance.d.ts +5 -54
- package/lib/mol-model/structure/query/utils/structure-distance.js +9 -9
- package/lib/mol-model/structure/structure/carbohydrates/constants.js +106 -106
- package/lib/mol-model/structure/structure/element/loci.js +5 -5
- package/lib/mol-model/structure/structure/element/stats.js +5 -5
- package/lib/mol-model/structure/structure/properties.js +5 -5
- package/lib/mol-model/structure/structure/structure.js +11 -11
- package/lib/mol-model/structure/structure/unit/bonds/inter-compute.js +5 -5
- package/lib/mol-model/structure/structure/unit/bonds/intra-compute.js +4 -4
- package/lib/mol-model/structure/structure/unit/bonds.js +2 -2
- package/lib/mol-model/structure/structure/unit/resonance.js +1 -1
- package/lib/mol-model/structure/structure/unit/rings/compute.js +6 -6
- package/lib/mol-model/structure/structure/unit/rings.js +6 -6
- package/lib/mol-model/structure/structure/unit.js +16 -16
- package/lib/mol-model/structure/structure/util/superposition-sifts-mapping.js +1 -1
- package/lib/mol-model/structure/util.js +4 -4
- package/lib/mol-model-formats/structure/basic/atomic.js +2 -2
- package/lib/mol-model-formats/structure/basic/parser.js +4 -4
- package/lib/mol-model-formats/structure/basic/properties.js +1 -1
- package/lib/mol-model-formats/structure/basic/sort.js +1 -1
- package/lib/mol-model-formats/structure/basic/util.js +1 -1
- package/lib/mol-model-formats/structure/cif-core.js +6 -6
- package/lib/mol-model-formats/structure/common/entity.js +1 -1
- package/lib/mol-model-formats/structure/cube.js +1 -1
- package/lib/mol-model-formats/structure/gro.js +1 -1
- package/lib/mol-model-formats/structure/mol.js +1 -1
- package/lib/mol-model-formats/structure/mol2.js +4 -4
- package/lib/mol-model-formats/structure/prmtop.js +1 -1
- package/lib/mol-model-formats/structure/property/bonds/chem_comp.js +3 -3
- package/lib/mol-model-formats/structure/property/bonds/index-pair.js +1 -1
- package/lib/mol-model-formats/structure/property/bonds/struct_conn.js +6 -6
- package/lib/mol-model-formats/structure/property/secondary-structure.js +8 -8
- package/lib/mol-model-formats/structure/psf.js +1 -1
- package/lib/mol-model-formats/structure/top.js +1 -1
- package/lib/mol-model-formats/structure/xyz.js +1 -1
- package/lib/mol-model-props/computed/accessible-surface-area/shrake-rupley/radii.js +2 -2
- package/lib/mol-model-props/computed/accessible-surface-area/shrake-rupley.js +3 -3
- package/lib/mol-model-props/computed/accessible-surface-area.js +2 -2
- package/lib/mol-model-props/computed/chemistry/functional-group.js +31 -31
- package/lib/mol-model-props/computed/chemistry/geometry.js +22 -22
- package/lib/mol-model-props/computed/chemistry/valence-model.js +32 -32
- package/lib/mol-model-props/computed/interactions/charged.js +39 -39
- package/lib/mol-model-props/computed/interactions/common.js +34 -34
- package/lib/mol-model-props/computed/interactions/contacts-builder.js +1 -1
- package/lib/mol-model-props/computed/interactions/contacts.js +1 -1
- package/lib/mol-model-props/computed/interactions/halogen-bonds.js +12 -12
- package/lib/mol-model-props/computed/interactions/hydrogen-bonds.js +32 -32
- package/lib/mol-model-props/computed/interactions/hydrophobic.js +9 -9
- package/lib/mol-model-props/computed/interactions/metal.js +26 -26
- package/lib/mol-model-props/computed/interactions/refine.js +20 -20
- package/lib/mol-model-props/computed/representations/interactions-inter-unit-cylinder.js +2 -2
- package/lib/mol-model-props/computed/representations/interactions-intra-unit-cylinder.js +2 -2
- package/lib/mol-model-props/computed/secondary-structure/dssp/bends.js +1 -1
- package/lib/mol-model-props/computed/secondary-structure/dssp/bridges.js +12 -12
- package/lib/mol-model-props/computed/secondary-structure/dssp/helices.js +6 -6
- package/lib/mol-model-props/computed/secondary-structure/dssp/ladders.js +3 -3
- package/lib/mol-model-props/computed/secondary-structure/dssp/sheets.js +11 -11
- package/lib/mol-model-props/computed/secondary-structure/dssp/turns.js +3 -3
- package/lib/mol-model-props/computed/secondary-structure/dssp.js +30 -30
- package/lib/mol-model-props/computed/themes/accessible-surface-area.js +1 -1
- package/lib/mol-model-props/computed/themes/interaction-type.js +10 -10
- package/lib/mol-model-props/integrative/cross-link-restraint/color.js +1 -1
- package/lib/mol-model-props/integrative/cross-link-restraint/format.js +3 -3
- package/lib/mol-model-props/sequence/sifts-mapping.js +1 -1
- package/lib/mol-model-props/sequence/themes/sifts-mapping.js +1 -1
- package/lib/mol-plugin/animation-loop.d.ts +2 -1
- package/lib/mol-plugin/animation-loop.js +18 -5
- package/lib/mol-plugin/behavior/dynamic/camera.js +12 -12
- package/lib/mol-plugin/behavior/dynamic/representation.js +7 -7
- package/lib/mol-plugin/context.d.ts +2 -2
- package/lib/mol-plugin/state.d.ts +1 -14
- package/lib/mol-plugin/version.js +2 -2
- package/lib/mol-plugin-state/formats/volume.d.ts +12 -11
- package/lib/mol-plugin-state/formats/volume.js +20 -13
- package/lib/mol-plugin-state/helpers/structure-selection-query.js +5 -5
- package/lib/mol-plugin-state/transforms/representation.js +2 -2
- package/lib/mol-plugin-ui/controls/parameters.d.ts +1 -1
- package/lib/mol-plugin-ui/sequence/polymer.js +1 -1
- package/lib/mol-plugin-ui/sequence/sequence.js +1 -1
- package/lib/mol-plugin-ui/structure/focus.js +1 -1
- package/lib/mol-plugin-ui/viewport.d.ts +2 -2
- package/lib/mol-repr/structure/visual/bond-inter-unit-cylinder.js +10 -10
- package/lib/mol-repr/structure/visual/bond-inter-unit-line.js +10 -10
- package/lib/mol-repr/structure/visual/bond-intra-unit-cylinder.js +12 -12
- package/lib/mol-repr/structure/visual/bond-intra-unit-line.js +12 -12
- package/lib/mol-repr/structure/visual/carbohydrate-symbol-mesh.js +16 -16
- package/lib/mol-repr/structure/visual/carbohydrate-terminal-link-cylinder.js +1 -1
- package/lib/mol-repr/structure/visual/gaussian-surface-mesh.js +9 -0
- package/lib/mol-repr/structure/visual/orientation-ellipsoid-mesh.js +4 -4
- package/lib/mol-repr/structure/visual/polymer-direction-wedge.js +1 -1
- package/lib/mol-repr/structure/visual/polymer-trace-mesh.js +2 -2
- package/lib/mol-repr/structure/visual/util/bond.js +2 -2
- package/lib/mol-repr/structure/visual/util/common.js +3 -3
- package/lib/mol-repr/structure/visual/util/link.js +30 -30
- package/lib/mol-repr/structure/visual/util/polymer/backbone.js +6 -6
- package/lib/mol-repr/structure/visual/util/polymer/gap-iterator.js +3 -3
- package/lib/mol-repr/structure/visual/util/polymer/trace-iterator.js +20 -20
- package/lib/mol-repr/structure/visual/util/polymer.js +6 -6
- package/lib/mol-script/language/symbol-table/core.d.ts +2 -2
- package/lib/mol-script/runtime/query/table.js +13 -13
- package/lib/mol-state/object.d.ts +3 -3
- package/lib/mol-task/util/user-timing.js +1 -1
- package/lib/mol-theme/clipping.js +19 -19
- package/lib/mol-theme/color/atom-id.js +1 -1
- package/lib/mol-theme/color/carbohydrate-symbol.js +1 -1
- package/lib/mol-theme/color/chain-id.js +4 -4
- package/lib/mol-theme/color/element-index.js +1 -1
- package/lib/mol-theme/color/element-symbol.js +1 -1
- package/lib/mol-theme/color/entity-id.js +4 -4
- package/lib/mol-theme/color/entity-source.js +5 -4
- package/lib/mol-theme/color/hydrophobicity.js +1 -1
- package/lib/mol-theme/color/illustrative.js +1 -1
- package/lib/mol-theme/color/model-index.js +1 -1
- package/lib/mol-theme/color/molecule-type.js +8 -8
- package/lib/mol-theme/color/occupancy.js +1 -1
- package/lib/mol-theme/color/operator-hkl.js +1 -1
- package/lib/mol-theme/color/operator-name.js +1 -1
- package/lib/mol-theme/color/partial-charge.js +1 -1
- package/lib/mol-theme/color/polymer-id.js +4 -4
- package/lib/mol-theme/color/polymer-index.js +1 -1
- package/lib/mol-theme/color/residue-name.js +1 -1
- package/lib/mol-theme/color/secondary-structure.js +12 -12
- package/lib/mol-theme/color/sequence-id.js +7 -7
- package/lib/mol-theme/color/shape-group.js +1 -1
- package/lib/mol-theme/color/uncertainty.js +1 -1
- package/lib/mol-theme/color/uniform.js +1 -1
- package/lib/mol-theme/color/unit-index.js +1 -1
- package/lib/mol-theme/color/volume-value.js +1 -1
- package/lib/mol-theme/label.js +3 -3
- package/lib/mol-util/binding.js +4 -4
- package/lib/mol-util/debug.d.ts +6 -1
- package/lib/mol-util/debug.js +9 -1
- package/lib/mol-util/input/input-observer.js +20 -20
- package/lib/mol-util/string-builder.js +1 -1
- package/lib/servers/model/preprocess/converter.js +1 -1
- package/lib/servers/model/server/query.js +1 -1
- package/lib/servers/model/utils/fetch-retry.js +3 -2
- package/lib/servers/volume/server/algebra/coordinate.js +6 -6
- package/lib/servers/volume/server/query/encode.js +1 -1
- package/package.json +8 -8
|
@@ -89,17 +89,17 @@ function hydrophobicRefiner(structure, interactions) {
|
|
|
89
89
|
handleResidueContact(dist, edge, keyB, map, set);
|
|
90
90
|
}
|
|
91
91
|
var residueInterMap = new Map();
|
|
92
|
-
var setInterFiltered = function (i) { return contacts.edges[i].props.flag = 1 /* Filtered */; };
|
|
92
|
+
var setInterFiltered = function (i) { return contacts.edges[i].props.flag = 1 /* InteractionFlag.Filtered */; };
|
|
93
93
|
var residueIntraMap;
|
|
94
94
|
var setIntraFiltered;
|
|
95
95
|
return {
|
|
96
|
-
isApplicable: function (type) { return type === 6 /* Hydrophobic */; },
|
|
96
|
+
isApplicable: function (type) { return type === 6 /* InteractionType.Hydrophobic */; },
|
|
97
97
|
handleInterContact: function (index, infoA, infoB) {
|
|
98
98
|
handleEdge(index, infoA, infoB, residueInterMap, setInterFiltered);
|
|
99
99
|
},
|
|
100
100
|
startUnit: function (unit, contacts, features) {
|
|
101
101
|
residueIntraMap = new Map();
|
|
102
|
-
setIntraFiltered = function (i) { return contacts.edgeProps.flag[i] = 1 /* Filtered */; };
|
|
102
|
+
setIntraFiltered = function (i) { return contacts.edgeProps.flag[i] = 1 /* InteractionFlag.Filtered */; };
|
|
103
103
|
},
|
|
104
104
|
handleIntraContact: function (index, infoA, infoB) {
|
|
105
105
|
handleEdge(index, infoA, infoB, residueIntraMap, setIntraFiltered);
|
|
@@ -113,34 +113,34 @@ function hydrophobicRefiner(structure, interactions) {
|
|
|
113
113
|
function weakHydrogenBondsRefiner(structure, interactions) {
|
|
114
114
|
var contacts = interactions.contacts;
|
|
115
115
|
var hasHydrogenBond = function (infoA, infoB) {
|
|
116
|
-
var acc = infoA.types[infoA.feature] === 9 /* WeakHydrogenDonor */ ? infoB : infoA;
|
|
116
|
+
var acc = infoA.types[infoA.feature] === 9 /* FeatureType.WeakHydrogenDonor */ ? infoB : infoA;
|
|
117
117
|
// check intra
|
|
118
118
|
var eI = acc.members[acc.offsets[acc.feature]];
|
|
119
119
|
var _a = interactions.unitsContacts.get(acc.unit.id), type = _a.edgeProps.type, _b = _a.elementsIndex, offsets = _b.offsets, indices = _b.indices;
|
|
120
120
|
for (var i = offsets[eI], il = offsets[eI + 1]; i < il; ++i) {
|
|
121
|
-
if (type[indices[i]] === 4 /* HydrogenBond */)
|
|
121
|
+
if (type[indices[i]] === 4 /* InteractionType.HydrogenBond */)
|
|
122
122
|
return true;
|
|
123
123
|
}
|
|
124
124
|
// check inter
|
|
125
125
|
var interIndices = contacts.getEdgeIndices(acc.feature, acc.unit.id);
|
|
126
126
|
for (var i = 0, il = interIndices.length; i < il; ++i) {
|
|
127
|
-
if (contacts.edges[interIndices[i]].props.type === 4 /* HydrogenBond */)
|
|
127
|
+
if (contacts.edges[interIndices[i]].props.type === 4 /* InteractionType.HydrogenBond */)
|
|
128
128
|
return true;
|
|
129
129
|
}
|
|
130
130
|
return false;
|
|
131
131
|
};
|
|
132
132
|
return {
|
|
133
|
-
isApplicable: function (type) { return type === 8 /* WeakHydrogenBond */; },
|
|
133
|
+
isApplicable: function (type) { return type === 8 /* InteractionType.WeakHydrogenBond */; },
|
|
134
134
|
handleInterContact: function (index, infoA, infoB) {
|
|
135
135
|
if (hasHydrogenBond(infoA, infoB)) {
|
|
136
|
-
contacts.edges[index].props.flag = 1 /* Filtered */;
|
|
136
|
+
contacts.edges[index].props.flag = 1 /* InteractionFlag.Filtered */;
|
|
137
137
|
}
|
|
138
138
|
},
|
|
139
139
|
startUnit: function () { },
|
|
140
140
|
handleIntraContact: function (index, infoA, infoB) {
|
|
141
141
|
if (hasHydrogenBond(infoA, infoB)) {
|
|
142
142
|
var flag = interactions.unitsContacts.get(infoA.unit.id).edgeProps.flag;
|
|
143
|
-
flag[index] = 1 /* Filtered */;
|
|
143
|
+
flag[index] = 1 /* InteractionFlag.Filtered */;
|
|
144
144
|
}
|
|
145
145
|
}
|
|
146
146
|
};
|
|
@@ -160,7 +160,7 @@ function filterInter(types, index, infoA, infoB, contacts) {
|
|
|
160
160
|
for (var j = offsetsB[featureB], jl = offsetsB[featureB + 1]; j < jl; ++j) {
|
|
161
161
|
var bI = infoB.members[j];
|
|
162
162
|
if (contacts.getContactIndicesForElement(bI, infoB.unit).includes(cI)) {
|
|
163
|
-
contacts.edges[index].props.flag = 1 /* Filtered */;
|
|
163
|
+
contacts.edges[index].props.flag = 1 /* InteractionFlag.Filtered */;
|
|
164
164
|
return;
|
|
165
165
|
}
|
|
166
166
|
}
|
|
@@ -184,7 +184,7 @@ function filterIntra(types, index, infoA, infoB, contacts) {
|
|
|
184
184
|
var bI = infoB.members[j];
|
|
185
185
|
for (var l = offsets[bI], ll = offsets[bI + 1]; l < ll; ++l) {
|
|
186
186
|
if (cI === indices[l]) {
|
|
187
|
-
flag[index] = 1 /* Filtered */;
|
|
187
|
+
flag[index] = 1 /* InteractionFlag.Filtered */;
|
|
188
188
|
return;
|
|
189
189
|
}
|
|
190
190
|
}
|
|
@@ -200,13 +200,13 @@ function filterIntra(types, index, infoA, infoB, contacts) {
|
|
|
200
200
|
function saltBridgeRefiner(structure, interactions) {
|
|
201
201
|
var contacts = interactions.contacts;
|
|
202
202
|
return {
|
|
203
|
-
isApplicable: function (type) { return type === 1 /* Ionic */; },
|
|
203
|
+
isApplicable: function (type) { return type === 1 /* InteractionType.Ionic */; },
|
|
204
204
|
handleInterContact: function (index, infoA, infoB) {
|
|
205
|
-
filterInter([4 /* HydrogenBond */, 8 /* WeakHydrogenBond */], index, infoA, infoB, contacts);
|
|
205
|
+
filterInter([4 /* InteractionType.HydrogenBond */, 8 /* InteractionType.WeakHydrogenBond */], index, infoA, infoB, contacts);
|
|
206
206
|
},
|
|
207
207
|
startUnit: function () { },
|
|
208
208
|
handleIntraContact: function (index, infoA, infoB) {
|
|
209
|
-
filterIntra([4 /* HydrogenBond */, 8 /* WeakHydrogenBond */], index, infoA, infoB, interactions.unitsContacts.get(infoA.unit.id));
|
|
209
|
+
filterIntra([4 /* InteractionType.HydrogenBond */, 8 /* InteractionType.WeakHydrogenBond */], index, infoA, infoB, interactions.unitsContacts.get(infoA.unit.id));
|
|
210
210
|
}
|
|
211
211
|
};
|
|
212
212
|
}
|
|
@@ -217,13 +217,13 @@ function saltBridgeRefiner(structure, interactions) {
|
|
|
217
217
|
function piStackingRefiner(structure, interactions) {
|
|
218
218
|
var contacts = interactions.contacts;
|
|
219
219
|
return {
|
|
220
|
-
isApplicable: function (type) { return type === 6 /* Hydrophobic */ || type === 2 /* CationPi */; },
|
|
220
|
+
isApplicable: function (type) { return type === 6 /* InteractionType.Hydrophobic */ || type === 2 /* InteractionType.CationPi */; },
|
|
221
221
|
handleInterContact: function (index, infoA, infoB) {
|
|
222
|
-
filterInter([3 /* PiStacking */], index, infoA, infoB, contacts);
|
|
222
|
+
filterInter([3 /* InteractionType.PiStacking */], index, infoA, infoB, contacts);
|
|
223
223
|
},
|
|
224
224
|
startUnit: function () { },
|
|
225
225
|
handleIntraContact: function (index, infoA, infoB) {
|
|
226
|
-
filterIntra([3 /* PiStacking */], index, infoA, infoB, interactions.unitsContacts.get(infoA.unit.id));
|
|
226
|
+
filterIntra([3 /* InteractionType.PiStacking */], index, infoA, infoB, interactions.unitsContacts.get(infoA.unit.id));
|
|
227
227
|
}
|
|
228
228
|
};
|
|
229
229
|
}
|
|
@@ -234,13 +234,13 @@ function piStackingRefiner(structure, interactions) {
|
|
|
234
234
|
function metalCoordinationRefiner(structure, interactions) {
|
|
235
235
|
var contacts = interactions.contacts;
|
|
236
236
|
return {
|
|
237
|
-
isApplicable: function (type) { return type === 1 /* Ionic */; },
|
|
237
|
+
isApplicable: function (type) { return type === 1 /* InteractionType.Ionic */; },
|
|
238
238
|
handleInterContact: function (index, infoA, infoB) {
|
|
239
|
-
filterInter([7 /* MetalCoordination */], index, infoA, infoB, contacts);
|
|
239
|
+
filterInter([7 /* InteractionType.MetalCoordination */], index, infoA, infoB, contacts);
|
|
240
240
|
},
|
|
241
241
|
startUnit: function () { },
|
|
242
242
|
handleIntraContact: function (index, infoA, infoB) {
|
|
243
|
-
filterIntra([7 /* MetalCoordination */], index, infoA, infoB, interactions.unitsContacts.get(infoA.unit.id));
|
|
243
|
+
filterIntra([7 /* InteractionType.MetalCoordination */], index, infoA, infoB, interactions.unitsContacts.get(infoA.unit.id));
|
|
244
244
|
}
|
|
245
245
|
};
|
|
246
246
|
}
|
|
@@ -41,7 +41,7 @@ function createInterUnitInteractionCylinderMesh(ctx, structure, theme, props, me
|
|
|
41
41
|
Vec3.set(posB, fB.x[indexB], fB.y[indexB], fB.z[indexB]);
|
|
42
42
|
Vec3.transformMat4(posB, posB, uB.conformation.operator.matrix);
|
|
43
43
|
},
|
|
44
|
-
style: function (edgeIndex) { return 1 /* Dashed */; },
|
|
44
|
+
style: function (edgeIndex) { return 1 /* LinkStyle.Dashed */; },
|
|
45
45
|
radius: function (edgeIndex) {
|
|
46
46
|
var b = edges[edgeIndex];
|
|
47
47
|
var fA = unitsFeatures.get(b.unitA);
|
|
@@ -55,7 +55,7 @@ function createInterUnitInteractionCylinderMesh(ctx, structure, theme, props, me
|
|
|
55
55
|
return Math.min(sizeA, sizeB) * sizeFactor;
|
|
56
56
|
},
|
|
57
57
|
ignore: function (edgeIndex) {
|
|
58
|
-
if (edges[edgeIndex].props.flag === 1 /* Filtered */)
|
|
58
|
+
if (edges[edgeIndex].props.flag === 1 /* InteractionFlag.Filtered */)
|
|
59
59
|
return true;
|
|
60
60
|
if (child) {
|
|
61
61
|
var b = edges[edgeIndex];
|
|
@@ -41,7 +41,7 @@ function createIntraUnitInteractionsCylinderMesh(ctx, unit, structure, theme, pr
|
|
|
41
41
|
Vec3.set(posA, x[a[edgeIndex]], y[a[edgeIndex]], z[a[edgeIndex]]);
|
|
42
42
|
Vec3.set(posB, x[b[edgeIndex]], y[b[edgeIndex]], z[b[edgeIndex]]);
|
|
43
43
|
},
|
|
44
|
-
style: function (edgeIndex) { return 1 /* Dashed */; },
|
|
44
|
+
style: function (edgeIndex) { return 1 /* LinkStyle.Dashed */; },
|
|
45
45
|
radius: function (edgeIndex) {
|
|
46
46
|
location.element = unit.elements[members[offsets[a[edgeIndex]]]];
|
|
47
47
|
var sizeA = theme.size.size(location);
|
|
@@ -50,7 +50,7 @@ function createIntraUnitInteractionsCylinderMesh(ctx, unit, structure, theme, pr
|
|
|
50
50
|
return Math.min(sizeA, sizeB) * sizeFactor;
|
|
51
51
|
},
|
|
52
52
|
ignore: function (edgeIndex) {
|
|
53
|
-
if (flag[edgeIndex] === 1 /* Filtered */)
|
|
53
|
+
if (flag[edgeIndex] === 1 /* InteractionFlag.Filtered */)
|
|
54
54
|
return true;
|
|
55
55
|
if (childUnit) {
|
|
56
56
|
var f = a[edgeIndex];
|
|
@@ -34,34 +34,34 @@ export function assignBridges(ctx) {
|
|
|
34
34
|
i = k + 1; // k is i - 1
|
|
35
35
|
j = l;
|
|
36
36
|
if (i !== j && hbonds.getDirectedEdgeIndex(j, i + 1) !== -1) {
|
|
37
|
-
flags[i] |= 2 /* B */;
|
|
38
|
-
flags[j] |= 2 /* B */;
|
|
37
|
+
flags[i] |= 2 /* DSSPType.Flag.B */;
|
|
38
|
+
flags[j] |= 2 /* DSSPType.Flag.B */;
|
|
39
39
|
// TODO move to constructor, actually omit object all together
|
|
40
|
-
bridges[bridges.length] = new Bridge(i, j, 0 /* PARALLEL */);
|
|
40
|
+
bridges[bridges.length] = new Bridge(i, j, 0 /* BridgeType.PARALLEL */);
|
|
41
41
|
}
|
|
42
42
|
// Parallel Bridge(i, j) =: [Hbond(j - 1, i) and Hbond(i, j + 1)]
|
|
43
43
|
i = k;
|
|
44
44
|
j = l - 1; // l is j + 1
|
|
45
45
|
if (i !== j && hbonds.getDirectedEdgeIndex(j - 1, i) !== -1) {
|
|
46
|
-
flags[i] |= 2 /* B */;
|
|
47
|
-
flags[j] |= 2 /* B */;
|
|
48
|
-
bridges[bridges.length] = new Bridge(j, i, 0 /* PARALLEL */);
|
|
46
|
+
flags[i] |= 2 /* DSSPType.Flag.B */;
|
|
47
|
+
flags[j] |= 2 /* DSSPType.Flag.B */;
|
|
48
|
+
bridges[bridges.length] = new Bridge(j, i, 0 /* BridgeType.PARALLEL */);
|
|
49
49
|
}
|
|
50
50
|
// Antiparallel Bridge(i, j) =: [Hbond(i, j) and Hbond(j, i)]
|
|
51
51
|
i = k;
|
|
52
52
|
j = l;
|
|
53
53
|
if (i !== j && hbonds.getDirectedEdgeIndex(j, i) !== -1) {
|
|
54
|
-
flags[i] |= 2 /* B */;
|
|
55
|
-
flags[j] |= 2 /* B */;
|
|
56
|
-
bridges[bridges.length] = new Bridge(j, i, 1 /* ANTI_PARALLEL */);
|
|
54
|
+
flags[i] |= 2 /* DSSPType.Flag.B */;
|
|
55
|
+
flags[j] |= 2 /* DSSPType.Flag.B */;
|
|
56
|
+
bridges[bridges.length] = new Bridge(j, i, 1 /* BridgeType.ANTI_PARALLEL */);
|
|
57
57
|
}
|
|
58
58
|
// Antiparallel Bridge(i, j) =: [Hbond(i - 1, j + 1) and Hbond(j - 1, i + l)]
|
|
59
59
|
i = k + 1;
|
|
60
60
|
j = l - 1;
|
|
61
61
|
if (i !== j && hbonds.getDirectedEdgeIndex(j - 1, i + 1) !== -1) {
|
|
62
|
-
flags[i] |= 2 /* B */;
|
|
63
|
-
flags[j] |= 2 /* B */;
|
|
64
|
-
bridges[bridges.length] = new Bridge(j, i, 1 /* ANTI_PARALLEL */);
|
|
62
|
+
flags[i] |= 2 /* DSSPType.Flag.B */;
|
|
63
|
+
flags[j] |= 2 /* DSSPType.Flag.B */;
|
|
64
|
+
bridges[bridges.length] = new Bridge(j, i, 1 /* BridgeType.ANTI_PARALLEL */);
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
}
|
|
@@ -19,8 +19,8 @@ import { DSSPType } from './common';
|
|
|
19
19
|
export function assignHelices(ctx) {
|
|
20
20
|
var proteinInfo = ctx.proteinInfo, flags = ctx.flags;
|
|
21
21
|
var residueCount = proteinInfo.residueIndices.length;
|
|
22
|
-
var turnFlag = [1024 /* T3S */, 2048 /* T4S */, 4096 /* T5S */, 128 /* T3 */, 256 /* T4 */, 512 /* T5 */];
|
|
23
|
-
var helixFlag = [0, 0, 0, 8 /* G */, 1 /* H */, 16 /* I */];
|
|
22
|
+
var turnFlag = [1024 /* DSSPType.Flag.T3S */, 2048 /* DSSPType.Flag.T4S */, 4096 /* DSSPType.Flag.T5S */, 128 /* DSSPType.Flag.T3 */, 256 /* DSSPType.Flag.T4 */, 512 /* DSSPType.Flag.T5 */];
|
|
23
|
+
var helixFlag = [0, 0, 0, 8 /* DSSPType.Flag.G */, 1 /* DSSPType.Flag.H */, 16 /* DSSPType.Flag.I */];
|
|
24
24
|
var helixCheckOrder = ctx.params.oldOrdering ? [4, 3, 5] : [3, 4, 5];
|
|
25
25
|
for (var ni = 0; ni < helixCheckOrder.length; ni++) {
|
|
26
26
|
var n = helixCheckOrder[ni];
|
|
@@ -30,14 +30,14 @@ export function assignHelices(ctx) {
|
|
|
30
30
|
var fI2 = DSSPType.create(flags[i + 1]);
|
|
31
31
|
// TODO rework to elegant solution which will not break instantly
|
|
32
32
|
if (ctx.params.oldOrdering) {
|
|
33
|
-
if ((n === 3 && (DSSPType.is(fI, 1 /* H */) || DSSPType.is(fI2, 1 /* H */)) || // for 3-10 yield to alpha helix
|
|
34
|
-
(n === 5 && ((DSSPType.is(fI, 1 /* H */) || DSSPType.is(fI, 8 /* G */)) || (DSSPType.is(fI2, 1 /* H */) || DSSPType.is(fI2, 8 /* G */)))))) { // for pi yield to all other helices
|
|
33
|
+
if ((n === 3 && (DSSPType.is(fI, 1 /* DSSPType.Flag.H */) || DSSPType.is(fI2, 1 /* DSSPType.Flag.H */)) || // for 3-10 yield to alpha helix
|
|
34
|
+
(n === 5 && ((DSSPType.is(fI, 1 /* DSSPType.Flag.H */) || DSSPType.is(fI, 8 /* DSSPType.Flag.G */)) || (DSSPType.is(fI2, 1 /* DSSPType.Flag.H */) || DSSPType.is(fI2, 8 /* DSSPType.Flag.G */)))))) { // for pi yield to all other helices
|
|
35
35
|
continue;
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
else {
|
|
39
|
-
if ((n === 4 && (DSSPType.is(fI, 8 /* G */) || DSSPType.is(fI2, 8 /* G */)) || // for alpha helix yield to 3-10
|
|
40
|
-
(n === 5 && ((DSSPType.is(fI, 1 /* H */) || DSSPType.is(fI, 8 /* G */)) || (DSSPType.is(fI2, 1 /* H */) || DSSPType.is(fI2, 8 /* G */)))))) { // for pi yield to all other helices
|
|
39
|
+
if ((n === 4 && (DSSPType.is(fI, 8 /* DSSPType.Flag.G */) || DSSPType.is(fI2, 8 /* DSSPType.Flag.G */)) || // for alpha helix yield to 3-10
|
|
40
|
+
(n === 5 && ((DSSPType.is(fI, 1 /* DSSPType.Flag.H */) || DSSPType.is(fI, 8 /* DSSPType.Flag.G */)) || (DSSPType.is(fI2, 1 /* DSSPType.Flag.H */) || DSSPType.is(fI2, 8 /* DSSPType.Flag.G */)))))) { // for pi yield to all other helices
|
|
41
41
|
continue;
|
|
42
42
|
}
|
|
43
43
|
}
|
|
@@ -11,7 +11,7 @@ function shouldExtendLadder(ladder, bridge) {
|
|
|
11
11
|
// only extend if residue 1 is sequence neighbor with regard to ladder
|
|
12
12
|
if (bridge.partner1 !== ladder.firstEnd + 1)
|
|
13
13
|
return false;
|
|
14
|
-
if (bridge.type === 0 /* PARALLEL */) {
|
|
14
|
+
if (bridge.type === 0 /* BridgeType.PARALLEL */) {
|
|
15
15
|
if (bridge.partner2 === ladder.secondEnd + 1) {
|
|
16
16
|
return true;
|
|
17
17
|
}
|
|
@@ -32,7 +32,7 @@ function resemblesBulge(ladder1, ladder2) {
|
|
|
32
32
|
if (!(ladder1.type === ladder2.type && ladder2.firstStart - ladder1.firstEnd < 6 &&
|
|
33
33
|
ladder1.firstStart < ladder2.firstStart && ladder2.nextLadder === 0))
|
|
34
34
|
return false;
|
|
35
|
-
if (ladder1.type === 0 /* PARALLEL */) {
|
|
35
|
+
if (ladder1.type === 0 /* BridgeType.PARALLEL */) {
|
|
36
36
|
return bulgeCriterion2(ladder1, ladder2);
|
|
37
37
|
}
|
|
38
38
|
else {
|
|
@@ -59,7 +59,7 @@ export function assignLadders(ctx) {
|
|
|
59
59
|
if (shouldExtendLadder(ladder, bridge)) {
|
|
60
60
|
found = true;
|
|
61
61
|
ladder.firstEnd++;
|
|
62
|
-
if (bridge.type === 0 /* PARALLEL */) {
|
|
62
|
+
if (bridge.type === 0 /* BridgeType.PARALLEL */) {
|
|
63
63
|
ladder.secondEnd++;
|
|
64
64
|
}
|
|
65
65
|
else {
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import { DSSPType } from './common';
|
|
8
8
|
function isHelixType(f) {
|
|
9
|
-
return DSSPType.is(f, 8 /* G */) || DSSPType.is(f, 1 /* H */) || DSSPType.is(f, 16 /* I */);
|
|
9
|
+
return DSSPType.is(f, 8 /* DSSPType.Flag.G */) || DSSPType.is(f, 1 /* DSSPType.Flag.H */) || DSSPType.is(f, 16 /* DSSPType.Flag.I */);
|
|
10
10
|
}
|
|
11
11
|
/**
|
|
12
12
|
* sheet=: set of one or more ladders connected by shared residues
|
|
@@ -21,15 +21,15 @@ export function assignSheets(ctx) {
|
|
|
21
21
|
var diff = ladder.firstStart - lcount;
|
|
22
22
|
var l2count = ladder.secondStart - diff;
|
|
23
23
|
if (ladder.firstStart !== ladder.firstEnd) {
|
|
24
|
-
flags[lcount] |= 4 /* E */;
|
|
25
|
-
flags[l2count] |= 4 /* E */;
|
|
24
|
+
flags[lcount] |= 4 /* DSSPType.Flag.E */;
|
|
25
|
+
flags[l2count] |= 4 /* DSSPType.Flag.E */;
|
|
26
26
|
}
|
|
27
27
|
else {
|
|
28
|
-
if (!isHelixType(flags[lcount]) && DSSPType.is(flags[lcount], 4 /* E */)) {
|
|
29
|
-
flags[lcount] |= 2 /* B */;
|
|
28
|
+
if (!isHelixType(flags[lcount]) && DSSPType.is(flags[lcount], 4 /* DSSPType.Flag.E */)) {
|
|
29
|
+
flags[lcount] |= 2 /* DSSPType.Flag.B */;
|
|
30
30
|
}
|
|
31
|
-
if (!isHelixType(flags[l2count]) && DSSPType.is(flags[l2count], 4 /* E */)) {
|
|
32
|
-
flags[l2count] |= 2 /* B */;
|
|
31
|
+
if (!isHelixType(flags[l2count]) && DSSPType.is(flags[l2count], 4 /* DSSPType.Flag.E */)) {
|
|
32
|
+
flags[l2count] |= 2 /* DSSPType.Flag.B */;
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
}
|
|
@@ -37,16 +37,16 @@ export function assignSheets(ctx) {
|
|
|
37
37
|
continue;
|
|
38
38
|
var conladder = ladders[ladder.nextLadder];
|
|
39
39
|
for (var lcount = ladder.firstStart; lcount <= conladder.firstEnd; lcount++) {
|
|
40
|
-
flags[lcount] |= 4 /* E */;
|
|
40
|
+
flags[lcount] |= 4 /* DSSPType.Flag.E */;
|
|
41
41
|
}
|
|
42
|
-
if (ladder.type === 0 /* PARALLEL */) {
|
|
42
|
+
if (ladder.type === 0 /* BridgeType.PARALLEL */) {
|
|
43
43
|
for (var lcount = ladder.secondStart; lcount <= conladder.secondEnd; lcount++) {
|
|
44
|
-
flags[lcount] |= 4 /* E */;
|
|
44
|
+
flags[lcount] |= 4 /* DSSPType.Flag.E */;
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
else {
|
|
48
48
|
for (var lcount = conladder.secondEnd; lcount <= ladder.secondStart; lcount++) {
|
|
49
|
-
flags[lcount] |= 4 /* E */;
|
|
49
|
+
flags[lcount] |= 4 /* DSSPType.Flag.E */;
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
}
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
*/
|
|
14
14
|
export function assignTurns(ctx) {
|
|
15
15
|
var proteinInfo = ctx.proteinInfo, hbonds = ctx.hbonds, flags = ctx.flags;
|
|
16
|
-
var turnFlag = [1024 /* T3S */, 2048 /* T4S */, 4096 /* T5S */, 128 /* T3 */, 256 /* T4 */, 512 /* T5 */];
|
|
16
|
+
var turnFlag = [1024 /* DSSPType.Flag.T3S */, 2048 /* DSSPType.Flag.T4S */, 4096 /* DSSPType.Flag.T5S */, 128 /* DSSPType.Flag.T3 */, 256 /* DSSPType.Flag.T4 */, 512 /* DSSPType.Flag.T5 */];
|
|
17
17
|
for (var idx = 0; idx < 3; idx++) {
|
|
18
18
|
for (var i = 0, il = proteinInfo.residueIndices.length - 1; i < il; ++i) {
|
|
19
19
|
// check if hbond exists
|
|
@@ -21,12 +21,12 @@ export function assignTurns(ctx) {
|
|
|
21
21
|
flags[i] |= turnFlag[idx + 3] | turnFlag[idx];
|
|
22
22
|
if (ctx.params.oldDefinition) {
|
|
23
23
|
for (var k = 1; k < idx + 3; ++k) {
|
|
24
|
-
flags[i + k] |= turnFlag[idx + 3] | 64 /* T */;
|
|
24
|
+
flags[i + k] |= turnFlag[idx + 3] | 64 /* DSSPType.Flag.T */;
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
else {
|
|
28
28
|
for (var k = 0; k <= idx + 3; ++k) {
|
|
29
|
-
flags[i + k] |= turnFlag[idx + 3] | 64 /* T */;
|
|
29
|
+
flags[i + k] |= turnFlag[idx + 3] | 64 /* DSSPType.Flag.T */;
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
}
|
|
@@ -129,71 +129,71 @@ function mapToKind(assignment) {
|
|
|
129
129
|
}
|
|
130
130
|
/** Original priority: H,B,E,G,I,T,S */
|
|
131
131
|
function getOriginalResidueFlag(f) {
|
|
132
|
-
if (DSSPType.is(f, 1 /* H */))
|
|
132
|
+
if (DSSPType.is(f, 1 /* DSSPType.Flag.H */))
|
|
133
133
|
return SecondaryStructureType.SecondaryStructureDssp.H;
|
|
134
|
-
if (DSSPType.is(f, 4 /* E */))
|
|
134
|
+
if (DSSPType.is(f, 4 /* DSSPType.Flag.E */))
|
|
135
135
|
return SecondaryStructureType.SecondaryStructureDssp.E;
|
|
136
|
-
if (DSSPType.is(f, 2 /* B */))
|
|
136
|
+
if (DSSPType.is(f, 2 /* DSSPType.Flag.B */))
|
|
137
137
|
return SecondaryStructureType.SecondaryStructureDssp.B;
|
|
138
|
-
if (DSSPType.is(f, 8 /* G */))
|
|
138
|
+
if (DSSPType.is(f, 8 /* DSSPType.Flag.G */))
|
|
139
139
|
return SecondaryStructureType.SecondaryStructureDssp.G;
|
|
140
|
-
if (DSSPType.is(f, 16 /* I */))
|
|
140
|
+
if (DSSPType.is(f, 16 /* DSSPType.Flag.I */))
|
|
141
141
|
return SecondaryStructureType.SecondaryStructureDssp.I;
|
|
142
|
-
if (DSSPType.is(f, 64 /* T */))
|
|
142
|
+
if (DSSPType.is(f, 64 /* DSSPType.Flag.T */))
|
|
143
143
|
return SecondaryStructureType.SecondaryStructureDssp.T;
|
|
144
|
-
if (DSSPType.is(f, 32 /* S */))
|
|
144
|
+
if (DSSPType.is(f, 32 /* DSSPType.Flag.S */))
|
|
145
145
|
return SecondaryStructureType.SecondaryStructureDssp.S;
|
|
146
|
-
return 0 /* None */;
|
|
146
|
+
return 0 /* SecondaryStructureType.Flag.None */;
|
|
147
147
|
}
|
|
148
148
|
function getOriginalFlagName(f) {
|
|
149
|
-
if (DSSPType.is(f, 1 /* H */))
|
|
149
|
+
if (DSSPType.is(f, 1 /* DSSPType.Flag.H */))
|
|
150
150
|
return 'H';
|
|
151
|
-
if (DSSPType.is(f, 4 /* E */))
|
|
151
|
+
if (DSSPType.is(f, 4 /* DSSPType.Flag.E */))
|
|
152
152
|
return 'E';
|
|
153
|
-
if (DSSPType.is(f, 2 /* B */))
|
|
153
|
+
if (DSSPType.is(f, 2 /* DSSPType.Flag.B */))
|
|
154
154
|
return 'B';
|
|
155
|
-
if (DSSPType.is(f, 8 /* G */))
|
|
155
|
+
if (DSSPType.is(f, 8 /* DSSPType.Flag.G */))
|
|
156
156
|
return 'G';
|
|
157
|
-
if (DSSPType.is(f, 16 /* I */))
|
|
157
|
+
if (DSSPType.is(f, 16 /* DSSPType.Flag.I */))
|
|
158
158
|
return 'I';
|
|
159
|
-
if (DSSPType.is(f, 64 /* T */))
|
|
159
|
+
if (DSSPType.is(f, 64 /* DSSPType.Flag.T */))
|
|
160
160
|
return 'T';
|
|
161
|
-
if (DSSPType.is(f, 32 /* S */))
|
|
161
|
+
if (DSSPType.is(f, 32 /* DSSPType.Flag.S */))
|
|
162
162
|
return 'S';
|
|
163
163
|
return '-';
|
|
164
164
|
}
|
|
165
165
|
/** Version 2.1.0 priority: I,H,B,E,G,T,S */
|
|
166
166
|
function getUpdatedResidueFlag(f) {
|
|
167
|
-
if (DSSPType.is(f, 16 /* I */))
|
|
167
|
+
if (DSSPType.is(f, 16 /* DSSPType.Flag.I */))
|
|
168
168
|
return SecondaryStructureType.SecondaryStructureDssp.I;
|
|
169
|
-
if (DSSPType.is(f, 1 /* H */))
|
|
169
|
+
if (DSSPType.is(f, 1 /* DSSPType.Flag.H */))
|
|
170
170
|
return SecondaryStructureType.SecondaryStructureDssp.H;
|
|
171
|
-
if (DSSPType.is(f, 4 /* E */))
|
|
171
|
+
if (DSSPType.is(f, 4 /* DSSPType.Flag.E */))
|
|
172
172
|
return SecondaryStructureType.SecondaryStructureDssp.E;
|
|
173
|
-
if (DSSPType.is(f, 2 /* B */))
|
|
173
|
+
if (DSSPType.is(f, 2 /* DSSPType.Flag.B */))
|
|
174
174
|
return SecondaryStructureType.SecondaryStructureDssp.B;
|
|
175
|
-
if (DSSPType.is(f, 8 /* G */))
|
|
175
|
+
if (DSSPType.is(f, 8 /* DSSPType.Flag.G */))
|
|
176
176
|
return SecondaryStructureType.SecondaryStructureDssp.G;
|
|
177
|
-
if (DSSPType.is(f, 64 /* T */))
|
|
177
|
+
if (DSSPType.is(f, 64 /* DSSPType.Flag.T */))
|
|
178
178
|
return SecondaryStructureType.SecondaryStructureDssp.T;
|
|
179
|
-
if (DSSPType.is(f, 32 /* S */))
|
|
179
|
+
if (DSSPType.is(f, 32 /* DSSPType.Flag.S */))
|
|
180
180
|
return SecondaryStructureType.SecondaryStructureDssp.S;
|
|
181
|
-
return 0 /* None */;
|
|
181
|
+
return 0 /* SecondaryStructureType.Flag.None */;
|
|
182
182
|
}
|
|
183
183
|
function getUpdatedFlagName(f) {
|
|
184
|
-
if (DSSPType.is(f, 16 /* I */))
|
|
184
|
+
if (DSSPType.is(f, 16 /* DSSPType.Flag.I */))
|
|
185
185
|
return 'I';
|
|
186
|
-
if (DSSPType.is(f, 1 /* H */))
|
|
186
|
+
if (DSSPType.is(f, 1 /* DSSPType.Flag.H */))
|
|
187
187
|
return 'H';
|
|
188
|
-
if (DSSPType.is(f, 4 /* E */))
|
|
188
|
+
if (DSSPType.is(f, 4 /* DSSPType.Flag.E */))
|
|
189
189
|
return 'E';
|
|
190
|
-
if (DSSPType.is(f, 2 /* B */))
|
|
190
|
+
if (DSSPType.is(f, 2 /* DSSPType.Flag.B */))
|
|
191
191
|
return 'B';
|
|
192
|
-
if (DSSPType.is(f, 8 /* G */))
|
|
192
|
+
if (DSSPType.is(f, 8 /* DSSPType.Flag.G */))
|
|
193
193
|
return 'G';
|
|
194
|
-
if (DSSPType.is(f, 64 /* T */))
|
|
194
|
+
if (DSSPType.is(f, 64 /* DSSPType.Flag.T */))
|
|
195
195
|
return 'T';
|
|
196
|
-
if (DSSPType.is(f, 32 /* S */))
|
|
196
|
+
if (DSSPType.is(f, 32 /* DSSPType.Flag.S */))
|
|
197
197
|
return 'S';
|
|
198
198
|
return '-';
|
|
199
199
|
}
|
|
@@ -64,7 +64,7 @@ export function AccessibleSurfaceAreaColorTheme(ctx, props) {
|
|
|
64
64
|
export var AccessibleSurfaceAreaColorThemeProvider = {
|
|
65
65
|
name: 'accessible-surface-area',
|
|
66
66
|
label: 'Accessible Surface Area',
|
|
67
|
-
category: "Residue Property" /* Residue */,
|
|
67
|
+
category: "Residue Property" /* ColorTheme.Category.Residue */,
|
|
68
68
|
factory: AccessibleSurfaceAreaColorTheme,
|
|
69
69
|
getParams: getAccessibleSurfaceAreaColorThemeParams,
|
|
70
70
|
defaultValues: PD.getDefaultValues(AccessibleSurfaceAreaColorThemeParams),
|
|
@@ -33,23 +33,23 @@ var InteractionTypeColorTable = [
|
|
|
33
33
|
];
|
|
34
34
|
function typeColor(type) {
|
|
35
35
|
switch (type) {
|
|
36
|
-
case 4 /* HydrogenBond */:
|
|
36
|
+
case 4 /* InteractionType.HydrogenBond */:
|
|
37
37
|
return InteractionTypeColors.HydrogenBond;
|
|
38
|
-
case 6 /* Hydrophobic */:
|
|
38
|
+
case 6 /* InteractionType.Hydrophobic */:
|
|
39
39
|
return InteractionTypeColors.Hydrophobic;
|
|
40
|
-
case 5 /* HalogenBond */:
|
|
40
|
+
case 5 /* InteractionType.HalogenBond */:
|
|
41
41
|
return InteractionTypeColors.HalogenBond;
|
|
42
|
-
case 1 /* Ionic */:
|
|
42
|
+
case 1 /* InteractionType.Ionic */:
|
|
43
43
|
return InteractionTypeColors.Ionic;
|
|
44
|
-
case 7 /* MetalCoordination */:
|
|
44
|
+
case 7 /* InteractionType.MetalCoordination */:
|
|
45
45
|
return InteractionTypeColors.MetalCoordination;
|
|
46
|
-
case 2 /* CationPi */:
|
|
46
|
+
case 2 /* InteractionType.CationPi */:
|
|
47
47
|
return InteractionTypeColors.CationPi;
|
|
48
|
-
case 3 /* PiStacking */:
|
|
48
|
+
case 3 /* InteractionType.PiStacking */:
|
|
49
49
|
return InteractionTypeColors.PiStacking;
|
|
50
|
-
case 8 /* WeakHydrogenBond */:
|
|
50
|
+
case 8 /* InteractionType.WeakHydrogenBond */:
|
|
51
51
|
return InteractionTypeColors.WeakHydrogenBond;
|
|
52
|
-
case 0 /* Unknown */:
|
|
52
|
+
case 0 /* InteractionType.Unknown */:
|
|
53
53
|
return DefaultColor;
|
|
54
54
|
}
|
|
55
55
|
}
|
|
@@ -95,7 +95,7 @@ export function InteractionTypeColorTheme(ctx, props) {
|
|
|
95
95
|
export var InteractionTypeColorThemeProvider = {
|
|
96
96
|
name: 'interaction-type',
|
|
97
97
|
label: 'Interaction Type',
|
|
98
|
-
category: "Miscellaneous" /* Misc */,
|
|
98
|
+
category: "Miscellaneous" /* ColorTheme.Category.Misc */,
|
|
99
99
|
factory: InteractionTypeColorTheme,
|
|
100
100
|
getParams: getInteractionTypeColorThemeParams,
|
|
101
101
|
defaultValues: PD.getDefaultValues(InteractionTypeColorThemeParams),
|
|
@@ -50,7 +50,7 @@ export function CrossLinkColorTheme(ctx, props) {
|
|
|
50
50
|
export var CrossLinkColorThemeProvider = {
|
|
51
51
|
name: 'cross-link',
|
|
52
52
|
label: 'Cross Link',
|
|
53
|
-
category: "Miscellaneous" /* Misc */,
|
|
53
|
+
category: "Miscellaneous" /* ColorTheme.Category.Misc */,
|
|
54
54
|
factory: CrossLinkColorTheme,
|
|
55
55
|
getParams: getCrossLinkColorThemeParams,
|
|
56
56
|
defaultValues: PD.getDefaultValues(CrossLinkColorThemeParams),
|
|
@@ -60,9 +60,9 @@ var ModelCrossLinkRestraint;
|
|
|
60
60
|
}
|
|
61
61
|
function getMapByKind(kind) {
|
|
62
62
|
switch (kind) {
|
|
63
|
-
case 0 /* Atomic */: return atomicElementMap;
|
|
64
|
-
case 1 /* Spheres */: return sphereElementMap;
|
|
65
|
-
case 2 /* Gaussians */: return gaussianElementMap;
|
|
63
|
+
case 0 /* Unit.Kind.Atomic */: return atomicElementMap;
|
|
64
|
+
case 1 /* Unit.Kind.Spheres */: return sphereElementMap;
|
|
65
|
+
case 2 /* Unit.Kind.Gaussians */: return gaussianElementMap;
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
68
|
/** map from atomic element to cross link indices */
|
|
@@ -70,7 +70,7 @@ var SIFTSMapping;
|
|
|
70
70
|
var residue = new Array(count);
|
|
71
71
|
for (var i = 0; i < count; i++) {
|
|
72
72
|
var row = atomSourceIndex.value(residueOffsets[i]);
|
|
73
|
-
if (db_name.valueKind(row) !== 0 /* Present */) {
|
|
73
|
+
if (db_name.valueKind(row) !== 0 /* Column.ValueKind.Present */) {
|
|
74
74
|
dbName[i] = '';
|
|
75
75
|
accession[i] = '';
|
|
76
76
|
num[i] = '';
|
|
@@ -72,7 +72,7 @@ export function SIFTSMappingColorTheme(ctx, props) {
|
|
|
72
72
|
export var SIFTSMappingColorThemeProvider = {
|
|
73
73
|
name: 'sifts-mapping',
|
|
74
74
|
label: 'SIFTS Mapping',
|
|
75
|
-
category: "Residue Property" /* Residue */,
|
|
75
|
+
category: "Residue Property" /* ColorTheme.Category.Residue */,
|
|
76
76
|
factory: SIFTSMappingColorTheme,
|
|
77
77
|
getParams: getSIFTSMappingColorThemeParams,
|
|
78
78
|
defaultValues: PD.getDefaultValues(SIFTSMappingColorThemeParams),
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
|
|
2
|
+
* Copyright (c) 2020-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
|
|
3
3
|
*
|
|
4
4
|
* @author David Sehnal <david.sehnal@gmail.com>
|
|
5
|
+
* @author Alexander Rose <alexander.rose@weirdbyte.de>
|
|
5
6
|
*/
|
|
6
7
|
import { PluginContext } from './context';
|
|
7
8
|
import { PluginAnimationManager } from '../mol-plugin-state/manager/animation';
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
|
|
2
|
+
* Copyright (c) 2020-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
|
|
3
3
|
*
|
|
4
4
|
* @author David Sehnal <david.sehnal@gmail.com>
|
|
5
|
+
* @author Alexander Rose <alexander.rose@weirdbyte.de>
|
|
5
6
|
*/
|
|
6
7
|
import { __awaiter, __generator } from "tslib";
|
|
7
8
|
import { now } from '../mol-util/now';
|
|
9
|
+
import { isTimingMode } from '../mol-util/debug';
|
|
10
|
+
import { printTimerResults } from '../mol-gl/webgl/timer';
|
|
8
11
|
var PluginAnimationLoop = /** @class */ (function () {
|
|
9
12
|
function PluginAnimationLoop(plugin) {
|
|
10
13
|
var _this = this;
|
|
@@ -26,14 +29,24 @@ var PluginAnimationLoop = /** @class */ (function () {
|
|
|
26
29
|
configurable: true
|
|
27
30
|
});
|
|
28
31
|
PluginAnimationLoop.prototype.tick = function (t, options) {
|
|
29
|
-
var _a;
|
|
32
|
+
var _a, _b;
|
|
30
33
|
return __awaiter(this, void 0, void 0, function () {
|
|
31
|
-
|
|
32
|
-
|
|
34
|
+
var timerResults, _i, timerResults_1, result;
|
|
35
|
+
return __generator(this, function (_c) {
|
|
36
|
+
switch (_c.label) {
|
|
33
37
|
case 0: return [4 /*yield*/, this.plugin.managers.animation.tick(t, options === null || options === void 0 ? void 0 : options.isSynchronous, options === null || options === void 0 ? void 0 : options.animation)];
|
|
34
38
|
case 1:
|
|
35
|
-
|
|
39
|
+
_c.sent();
|
|
36
40
|
(_a = this.plugin.canvas3d) === null || _a === void 0 ? void 0 : _a.tick(t, options);
|
|
41
|
+
if (isTimingMode) {
|
|
42
|
+
timerResults = (_b = this.plugin.canvas3d) === null || _b === void 0 ? void 0 : _b.webgl.timer.resolve();
|
|
43
|
+
if (timerResults) {
|
|
44
|
+
for (_i = 0, timerResults_1 = timerResults; _i < timerResults_1.length; _i++) {
|
|
45
|
+
result = timerResults_1[_i];
|
|
46
|
+
printTimerResults([result]);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
37
50
|
return [2 /*return*/];
|
|
38
51
|
}
|
|
39
52
|
});
|