molstar 3.7.0 → 3.8.0

package/lib/commonjs/extensions/rcsb/graphql/types.d.ts

@@ -650,6 +650,8 @@ export declare type CoreEntry = {
     readonly em_staining?: Maybe<ReadonlyArray<Maybe<EmStaining>>>;
     readonly em_vitrification?: Maybe<ReadonlyArray<Maybe<EmVitrification>>>;
     readonly entry?: Maybe<Entry>;
+    /** Get all groups for this PDB entry. */
+    readonly entry_groups?: Maybe<ReadonlyArray<Maybe<GroupEntry>>>;
     readonly exptl?: Maybe<ReadonlyArray<Maybe<Exptl>>>;
     readonly exptl_crystal?: Maybe<ReadonlyArray<Maybe<ExptlCrystal>>>;
     readonly exptl_crystal_grow?: Maybe<ReadonlyArray<Maybe<ExptlCrystalGrow>>>;
@@ -694,6 +696,7 @@ export declare type CoreEntry = {
     readonly rcsb_associated_holdings?: Maybe<CurrentEntry>;
     readonly rcsb_binding_affinity?: Maybe<ReadonlyArray<Maybe<RcsbBindingAffinity>>>;
     readonly rcsb_entry_container_identifiers: RcsbEntryContainerIdentifiers;
+    readonly rcsb_entry_group_membership?: Maybe<ReadonlyArray<Maybe<RcsbEntryGroupMembership>>>;
     readonly rcsb_entry_info: RcsbEntryInfo;
     readonly rcsb_external_references?: Maybe<ReadonlyArray<Maybe<RcsbExternalReferences>>>;
     /**
@@ -837,6 +840,8 @@ export declare type CorePolymerEntity = {
     readonly pdbx_entity_src_syn?: Maybe<ReadonlyArray<Maybe<PdbxEntitySrcSyn>>>;
     /** Get all unique Pfam annotations associated with this molecular entity. */
     readonly pfams?: Maybe<ReadonlyArray<Maybe<CorePfam>>>;
+    /** Get all groups for this PDB entity. */
+    readonly polymer_entity_groups?: Maybe<ReadonlyArray<Maybe<GroupPolymerEntity>>>;
     /** Get all unique polymer instances (chains) for this molecular entity. */
     readonly polymer_entity_instances?: Maybe<ReadonlyArray<Maybe<CorePolymerEntityInstance>>>;
     /** Get a BIRD chemical components described in this molecular entity. */
@@ -873,6 +878,7 @@ export declare type CorePolymerEntity = {
     readonly rcsb_polymer_entity_container_identifiers: RcsbPolymerEntityContainerIdentifiers;
     readonly rcsb_polymer_entity_feature?: Maybe<ReadonlyArray<Maybe<RcsbPolymerEntityFeature>>>;
     readonly rcsb_polymer_entity_feature_summary?: Maybe<ReadonlyArray<Maybe<RcsbPolymerEntityFeatureSummary>>>;
+    readonly rcsb_polymer_entity_group_membership?: Maybe<ReadonlyArray<Maybe<RcsbPolymerEntityGroupMembership>>>;
     readonly rcsb_polymer_entity_keywords?: Maybe<RcsbPolymerEntityKeywords>;
     readonly rcsb_polymer_entity_name_com?: Maybe<ReadonlyArray<Maybe<RcsbPolymerEntityNameCom>>>;
     readonly rcsb_polymer_entity_name_sys?: Maybe<ReadonlyArray<Maybe<RcsbPolymerEntityNameSys>>>;
@@ -3143,6 +3149,50 @@ export declare type GeneName = {
     readonly type?: Maybe<Scalars['String']>;
     readonly value?: Maybe<Scalars['String']>;
 };
+export declare type GroupEntry = {
+    /** Get provenance associated with this group. */
+    readonly group_provenance?: Maybe<GroupProvenance>;
+    readonly rcsb_group_accession_info?: Maybe<RcsbGroupAccessionInfo>;
+    readonly rcsb_group_container_identifiers: RcsbGroupContainerIdentifiers;
+    readonly rcsb_group_info: RcsbGroupInfo;
+    readonly rcsb_group_related?: Maybe<ReadonlyArray<Maybe<RcsbGroupRelated>>>;
+    readonly rcsb_group_statistics?: Maybe<RcsbGroupStatistics>;
+    /** A unique textual identifier for a group */
+    readonly rcsb_id: Scalars['String'];
+};
+export declare type GroupMembersAlignmentAlignedRegions = {
+    /** Aligned region length */
+    readonly length: Scalars['Int'];
+    /** Entity seqeunce start position */
+    readonly query_begin: Scalars['Int'];
+    /** NCBI sequence start position */
+    readonly target_begin: Scalars['Int'];
+};
+export declare type GroupMembersAlignmentScores = {
+    readonly query_coverage: Scalars['Int'];
+    readonly query_length: Scalars['Int'];
+    readonly target_coverage: Scalars['Int'];
+    readonly target_length: Scalars['Int'];
+};
+export declare type GroupPolymerEntity = {
+    /** Get provenance associated with this group. */
+    readonly group_provenance?: Maybe<GroupProvenance>;
+    readonly rcsb_group_accession_info?: Maybe<RcsbGroupAccessionInfo>;
+    readonly rcsb_group_container_identifiers: RcsbGroupContainerIdentifiers;
+    readonly rcsb_group_info: RcsbGroupInfo;
+    readonly rcsb_group_related?: Maybe<ReadonlyArray<Maybe<RcsbGroupRelated>>>;
+    readonly rcsb_group_statistics?: Maybe<RcsbGroupStatistics>;
+    /** A unique textual identifier for a group */
+    readonly rcsb_id: Scalars['String'];
+    readonly rcsb_polymer_entity_group_members_rankings?: Maybe<ReadonlyArray<Maybe<RcsbPolymerEntityGroupMembersRankings>>>;
+    readonly rcsb_polymer_entity_group_sequence_alignment?: Maybe<RcsbPolymerEntityGroupSequenceAlignment>;
+};
+export declare type GroupProvenance = {
+    readonly rcsb_group_aggregation_method?: Maybe<RcsbGroupAggregationMethod>;
+    readonly rcsb_group_provenance_container_identifiers?: Maybe<RcsbGroupProvenanceContainerIdentifiers>;
+    /** A unique textual identifier for a group provenance */
+    readonly rcsb_id?: Maybe<Scalars['String']>;
+};
 export declare type InterfacePartnerFeatureAdditionalProperties = {
     /**
      * The additional property name.
@@ -3163,6 +3213,16 @@ export declare type InterfacePartnerFeatureFeaturePositions = {
     /** The value(s) of the feature over the monomer segment. */
     readonly values?: Maybe<ReadonlyArray<Maybe<Scalars['Float']>>>;
 };
+export declare type MethodDetails = {
+    /** A description of special aspects of the clustering process */
+    readonly description?: Maybe<Scalars['String']>;
+    /** Defines the name of the description associated with the clustering process */
+    readonly name?: Maybe<Scalars['String']>;
+    /** Defines the type of the description associated with the clustering process */
+    readonly type?: Maybe<Scalars['String']>;
+    /** Defines the value associated with the clustering process */
+    readonly value?: Maybe<Scalars['Float']>;
+};
 export declare type PdbxAuditRevisionCategory = {
     /**
      * The category updated in the pdbx_audit_revision_category record.
@@ -6662,6 +6722,12 @@ export declare type Query = {
     readonly entries?: Maybe<ReadonlyArray<Maybe<CoreEntry>>>;
     /** Get PDB entry given the PDB id. */
     readonly entry?: Maybe<CoreEntry>;
+    /** Given a group ID get a group object formed by aggregating individual structures that share a degree of similarity */
+    readonly entry_group?: Maybe<GroupEntry>;
+    /** Given a list of group IDs get a list of group objects formed by aggregating structures that share a degree of similarity */
+    readonly entry_groups?: Maybe<ReadonlyArray<Maybe<GroupEntry>>>;
+    /** Given a group provenance ID get an object that describes aggregation method used to create groups */
+    readonly group_provenance?: Maybe<GroupProvenance>;
     /** Get a pairwise polymeric interface given the PDB ID, ASSEMBLY ID and INTERFACE ID. */
     readonly interface?: Maybe<CoreInterface>;
     /** Get a list of pairwise polymeric interfaces given a list of INTERFACE IDs. Here INTERFACE ID is a compound identifier that includes entry_id, assembly_id and interface_id e.g. 1XXX-1.1. */
@@ -6678,6 +6744,10 @@ export declare type Query = {
     readonly polymer_entities?: Maybe<ReadonlyArray<Maybe<CorePolymerEntity>>>;
     /** Get a PDB polymer entity, given the PDB ID and ENTITY ID. Here ENTITY ID is a '1', '2', '3', etc. */
     readonly polymer_entity?: Maybe<CorePolymerEntity>;
+    /** Given a group ID get a group object formed by aggregating polymer entities that share a degree of similarity */
+    readonly polymer_entity_group?: Maybe<GroupPolymerEntity>;
+    /** Given a list of group IDs get a list of group objects formed by aggregating polymer entities that share a degree of similarity */
+    readonly polymer_entity_groups?: Maybe<ReadonlyArray<Maybe<GroupPolymerEntity>>>;
     /** Get a PDB polymer entity instance (chain), given the PDB ID and ENTITY INSTANCE ID. Here ENTITY INSTANCE ID identifies structural element in the asymmetric unit, e.g. 'A', 'B', etc. */
     readonly polymer_entity_instance?: Maybe<CorePolymerEntityInstance>;
     /** Get a list of PDB polymer entity instances (chains), given the list of ENTITY INSTANCE IDs. Here ENTITY INSTANCE ID identifies structural element in the asymmetric unit, e.g. 'A', 'B', etc. */
@@ -6731,6 +6801,18 @@ export declare type QueryEntryArgs = {
     entry_id: Scalars['String'];
 };
 /** Query root */
+export declare type QueryEntry_GroupArgs = {
+    group_id: Scalars['String'];
+};
+/** Query root */
+export declare type QueryEntry_GroupsArgs = {
+    group_ids: ReadonlyArray<InputMaybe<Scalars['String']>>;
+};
+/** Query root */
+export declare type QueryGroup_ProvenanceArgs = {
+    group_provenance_id: Scalars['String'];
+};
+/** Query root */
 export declare type QueryInterfaceArgs = {
     assembly_id: Scalars['String'];
     entry_id: Scalars['String'];
@@ -6768,6 +6850,14 @@ export declare type QueryPolymer_EntityArgs = {
     entry_id: Scalars['String'];
 };
 /** Query root */
+export declare type QueryPolymer_Entity_GroupArgs = {
+    group_id: Scalars['String'];
+};
+/** Query root */
+export declare type QueryPolymer_Entity_GroupsArgs = {
+    group_ids: ReadonlyArray<InputMaybe<Scalars['String']>>;
+};
+/** Query root */
 export declare type QueryPolymer_Entity_InstanceArgs = {
     asym_id: Scalars['String'];
     entry_id: Scalars['String'];
@@ -8460,6 +8550,24 @@ export declare type RcsbEntryContainerIdentifiers = {
     /** List of identifiers for the solvent/water entity constituents for the entry. */
     readonly water_entity_ids?: Maybe<ReadonlyArray<Maybe<Scalars['String']>>>;
 };
+export declare type RcsbEntryGroupMembership = {
+    /**
+     * Method used to establish group membership
+     *
+     * Allowable values:
+     * matching_deposit_group_id
+     *
+     */
+    readonly aggregation_method: Scalars['String'];
+    /**
+     * A unique identifier for a group of entries
+     *
+     * Examples:
+     * G_1001001
+     *
+     */
+    readonly group_id: Scalars['String'];
+};
 export declare type RcsbEntryInfo = {
     /** The number of assemblies defined for this entry including the deposited assembly. */
     readonly assembly_count?: Maybe<Scalars['Int']>;
@@ -8683,6 +8791,118 @@ export declare type RcsbGenomicLineage = {
      */
     readonly name?: Maybe<Scalars['String']>;
 };
+export declare type RcsbGroupAccessionInfo = {
+    /** Identifies the version of the groups solution */
+    readonly version: Scalars['Int'];
+};
+export declare type RcsbGroupAggregationMethod = {
+    /** The details on a method used to calculate cluster solutions */
+    readonly method: RcsbGroupAggregationMethodMethod;
+    readonly similarity_criteria?: Maybe<RcsbGroupAggregationMethodSimilarityCriteria>;
+    /**
+     * Specifies the type of similarity criteria used to aggregate members into higher levels in the hierarchy
+     *
+     * Allowable values:
+     * sequence_identity, matching_uniprot_accession, matching_deposit_group_id
+     *
+     */
+    readonly type: Scalars['String'];
+};
+export declare type RcsbGroupAggregationMethodMethod = {
+    /** Additional details describing the clustering process */
+    readonly details?: Maybe<ReadonlyArray<Maybe<MethodDetails>>>;
+    /**
+     * The name of the software or the method used to calculate cluster solutions
+     *
+     * Allowable values:
+     * mmseqs2, matching_reference_identity
+     *
+     */
+    readonly name: Scalars['String'];
+    /**
+     * The version of the software.
+     *
+     * Examples:
+     * v1.0, 3.1-2, unknown
+     *
+     */
+    readonly version?: Maybe<Scalars['String']>;
+};
+export declare type RcsbGroupAggregationMethodSimilarityCriteria = {
+    /**
+     * A function or similarity measure that quantifies the similarity between two members
+     *
+     * Allowable values:
+     * rmsd, sequence_identity
+     *
+     */
+    readonly similarity_function?: Maybe<Scalars['String']>;
+};
+export declare type RcsbGroupContainerIdentifiers = {
+    /** A unique textual identifier for a group */
+    readonly group_id: Scalars['String'];
+    /** Member identifiers representing a group */
+    readonly group_member_ids: ReadonlyArray<Maybe<Scalars['String']>>;
+    /**
+     * A unique group provenance identifier
+     *
+     * Allowable values:
+     * provenance_sequence_identity, provenance_matching_uniprot_accession, provenance_matching_deposit_group_id
+     *
+     */
+    readonly group_provenance_id: Scalars['String'];
+    /** Member identifiers representing a higher level in the groping hierarchy that has parent-child relationship */
+    readonly parent_member_ids?: Maybe<ReadonlyArray<Maybe<Scalars['String']>>>;
+};
+export declare type RcsbGroupInfo = {
+    readonly group_description?: Maybe<Scalars['String']>;
+    readonly group_members_count: Scalars['Int'];
+    /**
+     * Granularity of group members identifiers
+     *
+     * Allowable values:
+     * assembly, entry, polymer_entity, polymer_entity_instance
+     *
+     */
+    readonly group_members_granularity: Scalars['String'];
+    readonly group_name?: Maybe<Scalars['String']>;
+};
+export declare type RcsbGroupProvenanceContainerIdentifiers = {
+    /**
+     * A unique group provenance identifier
+     *
+     * Allowable values:
+     * provenance_sequence_identity, provenance_matching_uniprot_accession, provenance_matching_deposit_group_id
+     *
+     */
+    readonly group_provenance_id: Scalars['String'];
+};
+export declare type RcsbGroupRelated = {
+    /**
+     * A unique code assigned to a reference related the group
+     *
+     * Examples:
+     * P69905
+     *
+     */
+    readonly resource_accession_code?: Maybe<Scalars['String']>;
+    /**
+     * Defines the type of the resource describing related references
+     *
+     * Examples:
+     * UniProt
+     *
+     */
+    readonly resource_name?: Maybe<Scalars['String']>;
+};
+export declare type RcsbGroupStatistics = {
+    /** The desired lower limit for the similarity between two members that belong to the same group */
+    readonly similarity_cutoff?: Maybe<Scalars['Float']>;
+    /** Similarity score between two most similar group members */
+    readonly similarity_score_max?: Maybe<Scalars['Float']>;
+    /** Similarity score between two least similar group members */
+    readonly similarity_score_min?: Maybe<Scalars['Float']>;
+};
 export declare type RcsbInterfaceContainerIdentifiers = {
     /** This item references an assembly in pdbx_struct_assembly */
     readonly assembly_id: Scalars['String'];
@@ -9663,6 +9883,7 @@ export declare type RcsbPolymerEntity = {
      *
      */
     readonly rcsb_multiple_source_flag?: Maybe<Scalars['String']>;
+    readonly rcsb_polymer_name_combined?: Maybe<RcsbPolymerEntityRcsbPolymerNameCombined>;
     /**
      * The number of biological sources for the polymer entity. Multiple source contributions
      *  may come from the same organism (taxonomy).
@@ -9978,6 +10199,63 @@ export declare type RcsbPolymerEntityFeatureSummary = {
      */
     readonly type?: Maybe<Scalars['String']>;
 };
+export declare type RcsbPolymerEntityGroupMembersRankings = {
+    readonly group_members: ReadonlyArray<Maybe<RcsbPolymerEntityGroupMembersRankingsGroupMembers>>;
+    /**
+     * Defines ranking option applicable to group members
+     *
+     * Allowable values:
+     * coverage
+     *
+     */
+    readonly ranking_criteria_type: Scalars['String'];
+};
+export declare type RcsbPolymerEntityGroupMembersRankingsGroupMembers = {
+    readonly member_id: Scalars['String'];
+    /** Quantifies the criteria used for ranking */
+    readonly original_score?: Maybe<Scalars['Float']>;
+    /** Reflects a relationship between group members such that, for any two members the first is ranked higher (smaller rank value) than the second */
+    readonly rank: Scalars['Int'];
+};
+export declare type RcsbPolymerEntityGroupMembership = {
+    /**
+     * Method used to establish group membership
+     *
+     * Allowable values:
+     * sequence_identity, matching_uniprot_accession
+     *
+     */
+    readonly aggregation_method: Scalars['String'];
+    /**
+     * A unique identifier for a group of entities
+     *
+     * Examples:
+     * 1_100, P00003
+     *
+     */
+    readonly group_id: Scalars['String'];
+    /** Degree of similarity expressed as a floating-point number */
+    readonly similarity_cutoff?: Maybe<Scalars['Float']>;
+};
+export declare type RcsbPolymerEntityGroupSequenceAlignment = {
+    /** Abstract reference where group members can be aligned to generate a MSA */
+    readonly abstract_reference: RcsbPolymerEntityGroupSequenceAlignmentAbstractReference;
+    /** List of alignments with core_entity canonical sequences */
+    readonly group_members_alignment: ReadonlyArray<Maybe<RcsbPolymerEntityGroupSequenceAlignmentGroupMembersAlignment>>;
+};
+export declare type RcsbPolymerEntityGroupSequenceAlignmentAbstractReference = {
+    /** Abstract reference length */
+    readonly length: Scalars['Int'];
+    /** Sequence that represents the abstract reference */
+    readonly sequence?: Maybe<Scalars['String']>;
+};
+export declare type RcsbPolymerEntityGroupSequenceAlignmentGroupMembersAlignment = {
+    /** Aligned region */
+    readonly aligned_regions: ReadonlyArray<Maybe<GroupMembersAlignmentAlignedRegions>>;
+    readonly member_id?: Maybe<Scalars['String']>;
+    /** Alignment scores */
+    readonly scores: GroupMembersAlignmentScores;
+};
 export declare type RcsbPolymerEntityInstanceContainerIdentifiers = {
     /** Instance identifier for this container. */
     readonly asym_id: Scalars['String'];
@@ -10089,6 +10367,12 @@ export declare type RcsbPolymerEntityRcsbMacromolecularNamesCombined = {
      */
     readonly provenance_source?: Maybe<Scalars['String']>;
 };
+export declare type RcsbPolymerEntityRcsbPolymerNameCombined = {
+    /** Protein name annotated by the UniProtKB or macromolecular name assigned by the PDB */
+    readonly names?: Maybe<ReadonlyArray<Maybe<Scalars['String']>>>;
+    /** Allowable values: PDB Preferred Name, PDB Description, UniProt Name. */
+    readonly provenance_source?: Maybe<Scalars['String']>;
+};
 export declare type RcsbPolymerInstanceAnnotation = {
     /** An identifier for the annotation. */
     readonly annotation_id?: Maybe<Scalars['String']>;

package/lib/commonjs/mol-canvas3d/passes/draw.d.ts

@@ -36,7 +36,6 @@ export declare class DrawPass {
     private depthTargetPrimitives;
     private depthTargetVolumes;
     private depthTextureVolumes;
-    private depthMerge;
     private copyFboTarget;
     private copyFboPostprocessing;
     private wboit;
@@ -47,7 +46,6 @@ export declare class DrawPass {
     constructor(webgl: WebGLContext, width: number, height: number, enableWboit: boolean);
     reset(): void;
     setSize(width: number, height: number): void;
-    private _depthMerge;
     private _renderWboit;
     private _renderBlended;
     private _render;

package/lib/commonjs/mol-canvas3d/passes/draw.js

@@ -7,30 +7,14 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrawPass = void 0;
-var tslib_1 = require("tslib");
 var render_target_1 = require("../../mol-gl/webgl/render-target");
-var util_1 = require("../../mol-gl/compute/util");
-var schema_1 = require("../../mol-gl/renderable/schema");
-var renderable_1 = require("../../mol-gl/renderable");
-var shader_code_1 = require("../../mol-gl/shader-code");
-var render_item_1 = require("../../mol-gl/webgl/render-item");
 var mol_util_1 = require("../../mol-util");
 var linear_algebra_1 = require("../../mol-math/linear-algebra");
-var quad_vert_1 = require("../../mol-gl/shader/quad.vert");
-var depth_merge_frag_1 = require("../../mol-gl/shader/depth-merge.frag");
 var stereo_1 = require("../camera/stereo");
 var wboit_1 = require("./wboit");
 var postprocessing_1 = require("./postprocessing");
 var marking_1 = require("./marking");
-var util_2 = require("../../mol-gl/compute/util");
-var DepthMergeSchema = tslib_1.__assign(tslib_1.__assign({}, util_1.QuadSchema), { tDepthPrimitives: (0, schema_1.TextureSpec)('texture', 'depth', 'ushort', 'nearest'), tDepthVolumes: (0, schema_1.TextureSpec)('texture', 'depth', 'ushort', 'nearest'), uTexSize: (0, schema_1.UniformSpec)('v2'), dPackedDepth: (0, schema_1.DefineSpec)('boolean') });
-var DepthMergeShaderCode = (0, shader_code_1.ShaderCode)('depth-merge', quad_vert_1.quad_vert, depth_merge_frag_1.depthMerge_frag);
-function getDepthMergeRenderable(ctx, depthTexturePrimitives, depthTextureVolumes, packedDepth) {
-    var values = tslib_1.__assign(tslib_1.__assign({}, util_1.QuadValues), { tDepthPrimitives: mol_util_1.ValueCell.create(depthTexturePrimitives), tDepthVolumes: mol_util_1.ValueCell.create(depthTextureVolumes), uTexSize: mol_util_1.ValueCell.create(linear_algebra_1.Vec2.create(depthTexturePrimitives.getWidth(), depthTexturePrimitives.getHeight())), dPackedDepth: mol_util_1.ValueCell.create(packedDepth) });
-    var schema = tslib_1.__assign({}, DepthMergeSchema);
-    var renderItem = (0, render_item_1.createComputeRenderItem)(ctx, 'triangles', DepthMergeShaderCode, schema, values);
-    return (0, renderable_1.createComputeRenderable)(renderItem, values);
-}
+var util_1 = require("../../mol-gl/compute/util");
 var DrawPass = /** @class */ (function () {
     function DrawPass(webgl, width, height, enableWboit) {
         this.webgl = webgl;
@@ -48,13 +32,12 @@ var DrawPass = /** @class */ (function () {
             this.depthTexturePrimitives.define(width, height);
             this.depthTextureVolumes.define(width, height);
         }
-        this.depthMerge = getDepthMergeRenderable(webgl, this.depthTexturePrimitives, this.depthTextureVolumes, this.packedDepth);
         this.wboit = enableWboit ? new wboit_1.WboitPass(webgl, width, height) : undefined;
         this.marking = new marking_1.MarkingPass(webgl, width, height);
         this.postprocessing = new postprocessing_1.PostprocessingPass(webgl, this);
         this.antialiasing = new postprocessing_1.AntialiasingPass(webgl, this);
-        this.copyFboTarget = (0, util_2.createCopyRenderable)(webgl, this.colorTarget.texture);
-        this.copyFboPostprocessing = (0, util_2.createCopyRenderable)(webgl, this.postprocessing.target.texture);
+        this.copyFboTarget = (0, util_1.createCopyRenderable)(webgl, this.colorTarget.texture);
+        this.copyFboPostprocessing = (0, util_1.createCopyRenderable)(webgl, this.postprocessing.target.texture);
     }
     Object.defineProperty(DrawPass.prototype, "wboitEnabled", {
         get: function () {
@@ -87,7 +70,6 @@ var DrawPass = /** @class */ (function () {
             else {
                 this.depthTextureVolumes.define(width, height);
             }
-            mol_util_1.ValueCell.update(this.depthMerge.values.uTexSize, linear_algebra_1.Vec2.set(this.depthMerge.values.uTexSize.ref.value, width, height));
             mol_util_1.ValueCell.update(this.copyFboTarget.values.uTexSize, linear_algebra_1.Vec2.set(this.copyFboTarget.values.uTexSize.ref.value, width, height));
             mol_util_1.ValueCell.update(this.copyFboPostprocessing.values.uTexSize, linear_algebra_1.Vec2.set(this.copyFboPostprocessing.values.uTexSize.ref.value, width, height));
             if ((_a = this.wboit) === null || _a === void 0 ? void 0 : _a.supported) {
@@ -98,18 +80,6 @@ var DrawPass = /** @class */ (function () {
             this.antialiasing.setSize(width, height);
         }
     };
-    DrawPass.prototype._depthMerge = function () {
-        var _a = this.webgl, state = _a.state, gl = _a.gl;
-        this.depthMerge.update();
-        this.depthTarget.bind();
-        state.disable(gl.BLEND);
-        state.disable(gl.DEPTH_TEST);
-        state.disable(gl.CULL_FACE);
-        state.depthMask(false);
-        state.clearColor(1, 1, 1, 1);
-        gl.clear(gl.COLOR_BUFFER_BIT);
-        this.depthMerge.render();
-    };
     DrawPass.prototype._renderWboit = function (renderer, camera, scene, transparentBackground, postprocessingProps) {
         var _a;
         if (!((_a = this.wboit) === null || _a === void 0 ? void 0 : _a.supported))
@@ -121,32 +91,31 @@ var DrawPass = /** @class */ (function () {
         this.colorTarget.bind();
         renderer.clearDepth();
         renderer.renderWboitOpaque(scene.primitives, camera, null);
-        // render opaque volumes
-        this.depthTextureVolumes.attachFramebuffer(this.colorTarget.framebuffer, 'depth');
-        this.colorTarget.bind();
-        renderer.clearDepth();
-        renderer.renderWboitOpaque(scene.volumes, camera, this.depthTexturePrimitives);
-        // merge depth of opaque primitives and volumes
-        this._depthMerge();
         if (postprocessing_1.PostprocessingPass.isEnabled(postprocessingProps)) {
+            if (postprocessing_1.PostprocessingPass.isOutlineEnabled(postprocessingProps)) {
+                this.depthTarget.bind();
+                renderer.clearDepth(true);
+                if (scene.getOpacityAverage() < 1) {
+                    renderer.renderDepthTransparent(scene.primitives, camera, this.depthTexturePrimitives);
+                }
+            }
             this.postprocessing.render(camera, false, transparentBackground, renderer.props.backgroundColor, postprocessingProps);
         }
         // render transparent primitives and volumes
         this.wboit.bind();
-        renderer.renderWboitTransparent(scene.primitives, camera, this.depthTexture);
-        renderer.renderWboitTransparent(scene.volumes, camera, this.depthTexture);
+        renderer.renderWboitTransparent(scene.primitives, camera, this.depthTexturePrimitives);
+        renderer.renderWboitTransparent(scene.volumes, camera, this.depthTexturePrimitives);
         // evaluate wboit
         if (postprocessing_1.PostprocessingPass.isEnabled(postprocessingProps)) {
-            this.depthTexturePrimitives.attachFramebuffer(this.postprocessing.target.framebuffer, 'depth');
             this.postprocessing.target.bind();
         }
         else {
-            this.depthTexturePrimitives.attachFramebuffer(this.colorTarget.framebuffer, 'depth');
             this.colorTarget.bind();
         }
         this.wboit.render();
     };
     DrawPass.prototype._renderBlended = function (renderer, camera, scene, toDrawingBuffer, transparentBackground, postprocessingProps) {
+        var _a, _b;
         if (toDrawingBuffer) {
             this.drawTarget.bind();
         }
@@ -163,37 +132,33 @@ var DrawPass = /** @class */ (function () {
             // extensions.depthTexture is unsupported (i.e. depthTarget is set)
             if (this.depthTargetPrimitives) {
                 this.depthTargetPrimitives.bind();
-                renderer.clear(false);
-                // TODO: this should only render opaque
-                renderer.renderDepth(scene.primitives, camera, null);
-                this.colorTarget.bind();
-            }
-            // do direct-volume rendering
-            if (!this.packedDepth) {
-                this.depthTextureVolumes.attachFramebuffer(this.colorTarget.framebuffer, 'depth');
-                renderer.clearDepth(); // from previous frame
-            }
-            renderer.renderBlendedVolumeOpaque(scene.volumes, camera, this.depthTexturePrimitives);
-            // do volume depth pass if extensions.depthTexture is unsupported (i.e. depthTarget is set)
-            if (this.depthTargetVolumes) {
-                this.depthTargetVolumes.bind();
-                renderer.clear(false);
-                renderer.renderDepth(scene.volumes, camera, this.depthTexturePrimitives);
+                renderer.clearDepth(true);
+                renderer.renderDepthOpaque(scene.primitives, camera, null);
                 this.colorTarget.bind();
             }
-            // merge depths from primitive and volume rendering
-            this._depthMerge();
-            this.colorTarget.bind();
             if (postprocessing_1.PostprocessingPass.isEnabled(postprocessingProps)) {
+                if (!this.packedDepth) {
+                    this.depthTexturePrimitives.detachFramebuffer(this.postprocessing.target.framebuffer, 'depth');
+                }
+                else {
+                    (_a = this.colorTarget.depthRenderbuffer) === null || _a === void 0 ? void 0 : _a.detachFramebuffer(this.postprocessing.target.framebuffer);
+                }
+                if (postprocessing_1.PostprocessingPass.isOutlineEnabled(postprocessingProps)) {
+                    this.depthTarget.bind();
+                    renderer.clearDepth(true);
+                    if (scene.getOpacityAverage() < 1) {
+                        renderer.renderDepthTransparent(scene.primitives, camera, this.depthTexturePrimitives);
+                    }
+                }
                 this.postprocessing.render(camera, false, transparentBackground, renderer.props.backgroundColor, postprocessingProps);
+                if (!this.packedDepth) {
+                    this.depthTexturePrimitives.attachFramebuffer(this.postprocessing.target.framebuffer, 'depth');
+                }
+                else {
+                    (_b = this.colorTarget.depthRenderbuffer) === null || _b === void 0 ? void 0 : _b.attachFramebuffer(this.postprocessing.target.framebuffer);
+                }
             }
-            renderer.renderBlendedVolumeTransparent(scene.volumes, camera, this.depthTexturePrimitives);
-            var target = postprocessing_1.PostprocessingPass.isEnabled(postprocessingProps)
-                ? this.postprocessing.target : this.colorTarget;
-            if (!this.packedDepth) {
-                this.depthTexturePrimitives.attachFramebuffer(target.framebuffer, 'depth');
-            }
-            target.bind();
+            renderer.renderBlendedVolume(scene.volumes, camera, this.depthTexturePrimitives);
         }
         renderer.renderBlendedTransparent(scene.primitives, camera, null);
     };

package/lib/commonjs/mol-canvas3d/passes/pick.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2019-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */

package/lib/commonjs/mol-canvas3d/passes/pick.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2019-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */

package/lib/commonjs/mol-canvas3d/passes/postprocessing.d.ts

@@ -38,6 +38,7 @@ export declare class PostprocessingPass {
     private webgl;
     private drawPass;
     static isEnabled(props: PostprocessingProps): boolean;
+    static isOutlineEnabled(props: PostprocessingProps): boolean;
     readonly target: RenderTarget;
     private readonly outlinesTarget;
     private readonly outlinesRenderable;