molstar 4.0.1 → 4.2.0

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

@@ -1,13 +1,13 @@
 "use strict";
 /**
- * Copyright (c) 2019-2023 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Áron Samuel Kovács <aron.kovacs@mail.muni.cz>
  * @author Ludovic Autin <ludovic.autin@gmail.com>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AntialiasingPass = exports.PostprocessingPass = exports.PostprocessingParams = void 0;
+exports.AntialiasingPass = exports.PostprocessingPass = exports.PostprocessingParams = exports.getOutlinesRenderable = exports.OutlinesSchema = void 0;
 const util_1 = require("../../mol-gl/compute/util");
 const schema_1 = require("../../mol-gl/renderable/schema");
 const shader_code_1 = require("../../mol-gl/shader-code");
@@ -28,7 +28,8 @@ const debug_1 = require("../../mol-util/debug");
 const background_1 = require("./background");
 const shadows_frag_1 = require("../../mol-gl/shader/shadows.frag");
 const cas_1 = require("./cas");
-const OutlinesSchema = {
+const bloom_1 = require("./bloom");
+exports.OutlinesSchema = {
     ...util_1.QuadSchema,
     tDepthOpaque: (0, schema_1.TextureSpec)('texture', 'rgba', 'ubyte', 'nearest'),
     tDepthTransparent: (0, schema_1.TextureSpec)('texture', 'rgba', 'ubyte', 'nearest'),
@@ -55,11 +56,12 @@ function getOutlinesRenderable(ctx, depthTextureOpaque, depthTextureTransparent,
         uOutlineThreshold: mol_util_1.ValueCell.create(0.33),
         dTransparentOutline: mol_util_1.ValueCell.create(transparentOutline),
     };
-    const schema = { ...OutlinesSchema };
+    const schema = { ...exports.OutlinesSchema };
     const shaderCode = (0, shader_code_1.ShaderCode)('outlines', quad_vert_1.quad_vert, outlines_frag_1.outlines_frag);
     const renderItem = (0, render_item_1.createComputeRenderItem)(ctx, 'triangles', shaderCode, schema, values);
     return (0, renderable_1.createComputeRenderable)(renderItem, values);
 }
+exports.getOutlinesRenderable = getOutlinesRenderable;
 const ShadowsSchema = {
     ...util_1.QuadSchema,
     tDepth: (0, schema_1.TextureSpec)('texture', 'rgba', 'ubyte', 'nearest'),
@@ -326,6 +328,10 @@ exports.PostprocessingParams = {
         off: param_definition_1.ParamDefinition.Group({})
     }, { cycle: true, description: 'Contrast Adaptive Sharpening' }),
     background: param_definition_1.ParamDefinition.Group(background_1.BackgroundParams, { isFlat: true }),
+    bloom: param_definition_1.ParamDefinition.MappedStatic('on', {
+        on: param_definition_1.ParamDefinition.Group(bloom_1.BloomParams),
+        off: param_definition_1.ParamDefinition.Group({})
+    }, { cycle: true, description: 'Bloom' }),
 };
 function getLevels(props, levels) {
     const count = props.length;
@@ -381,22 +387,22 @@ class PostprocessingPass {
         const qw = Math.max(1, Math.floor(sw * 0.25));
         const qh = Math.max(1, Math.floor(sh * 0.25));
         this.downsampledDepthTarget = drawPass.packedDepth
-            ? webgl.createRenderTarget(sw, sh, false, 'uint8', 'linear', 'rgba')
-            : webgl.createRenderTarget(sw, sh, false, 'float32', 'linear', webgl.isWebGL2 ? 'alpha' : 'rgba');
+            ? webgl.createRenderTarget(sw, sh, false, 'uint8', 'nearest', 'rgba')
+            : webgl.createRenderTarget(sw, sh, false, 'float32', 'nearest', webgl.isWebGL2 ? 'alpha' : 'rgba');
         this.downsampleDepthRenderable = (0, util_1.createCopyRenderable)(webgl, depthTextureOpaque);
         const depthTexture = this.ssaoScale === 1 ? depthTextureOpaque : this.downsampledDepthTarget.texture;
         this.depthHalfTarget = drawPass.packedDepth
-            ? webgl.createRenderTarget(hw, hh, false, 'uint8', 'linear', 'rgba')
-            : webgl.createRenderTarget(hw, hh, false, 'float32', 'linear', webgl.isWebGL2 ? 'alpha' : 'rgba');
+            ? webgl.createRenderTarget(hw, hh, false, 'uint8', 'nearest', 'rgba')
+            : webgl.createRenderTarget(hw, hh, false, 'float32', 'nearest', webgl.isWebGL2 ? 'alpha' : 'rgba');
         this.depthHalfRenderable = (0, util_1.createCopyRenderable)(webgl, depthTexture);
         this.depthQuarterTarget = drawPass.packedDepth
-            ? webgl.createRenderTarget(qw, qh, false, 'uint8', 'linear', 'rgba')
-            : webgl.createRenderTarget(qw, qh, false, 'float32', 'linear', webgl.isWebGL2 ? 'alpha' : 'rgba');
+            ? webgl.createRenderTarget(qw, qh, false, 'uint8', 'nearest', 'rgba')
+            : webgl.createRenderTarget(qw, qh, false, 'float32', 'nearest', webgl.isWebGL2 ? 'alpha' : 'rgba');
         this.depthQuarterRenderable = (0, util_1.createCopyRenderable)(webgl, this.depthHalfTarget.texture);
-        this.ssaoDepthTexture = webgl.resources.texture('image-uint8', 'rgba', 'ubyte', 'linear');
+        this.ssaoDepthTexture = webgl.resources.texture('image-uint8', 'rgba', 'ubyte', 'nearest');
         this.ssaoDepthTexture.define(sw, sh);
         this.ssaoDepthTexture.attachFramebuffer(this.ssaoFramebuffer, 'color0');
-        this.ssaoDepthBlurProxyTexture = webgl.resources.texture('image-uint8', 'rgba', 'ubyte', 'linear');
+        this.ssaoDepthBlurProxyTexture = webgl.resources.texture('image-uint8', 'rgba', 'ubyte', 'nearest');
         this.ssaoDepthBlurProxyTexture.define(sw, sh);
         this.ssaoDepthBlurProxyTexture.attachFramebuffer(this.ssaoBlurFirstPassFramebuffer, 'color0');
         this.ssaoDepthTexture.attachFramebuffer(this.ssaoBlurSecondPassFramebuffer, 'color0');
@@ -741,11 +747,7 @@ class AntialiasingPass {
     static isEnabled(props) {
         return props.antialiasing.name !== 'off';
     }
-    constructor(webgl, drawPass) {
-        this.drawPass = drawPass;
-        const { colorTarget } = drawPass;
-        const width = colorTarget.getWidth();
-        const height = colorTarget.getHeight();
+    constructor(webgl, width, height) {
         this.target = webgl.createRenderTarget(width, height, false);
         this.internalTarget = webgl.createRenderTarget(width, height, false);
         this.fxaa = new fxaa_1.FxaaPass(webgl, this.target.texture);
@@ -764,60 +766,53 @@ class AntialiasingPass {
             this.cas.setSize(width, height);
         }
     }
-    _renderFxaa(camera, target, props) {
+    _renderFxaa(camera, input, target, props) {
         if (props.antialiasing.name !== 'fxaa')
             return;
-        const input = PostprocessingPass.isEnabled(props)
-            ? this.drawPass.postprocessing.target.texture
-            : this.drawPass.colorTarget.texture;
         this.fxaa.update(input, props.antialiasing.params);
         this.fxaa.render(camera.viewport, target);
     }
-    _renderSmaa(camera, target, props) {
+    _renderSmaa(camera, input, target, props) {
         if (props.antialiasing.name !== 'smaa')
             return;
-        const input = PostprocessingPass.isEnabled(props)
-            ? this.drawPass.postprocessing.target.texture
-            : this.drawPass.colorTarget.texture;
         this.smaa.update(input, props.antialiasing.params);
         this.smaa.render(camera.viewport, target);
     }
-    _renderAntialiasing(camera, target, props) {
+    _renderAntialiasing(camera, input, target, props) {
         if (props.antialiasing.name === 'fxaa') {
-            this._renderFxaa(camera, target, props);
+            this._renderFxaa(camera, input, target, props);
         }
         else if (props.antialiasing.name === 'smaa') {
-            this._renderSmaa(camera, target, props);
+            this._renderSmaa(camera, input, target, props);
         }
     }
-    _renderCas(camera, target, props) {
+    _renderCas(camera, input, target, props) {
         if (props.sharpening.name !== 'on')
             return;
-        const input = props.antialiasing.name !== 'off'
-            ? this.internalTarget.texture
-            : PostprocessingPass.isEnabled(props)
-                ? this.drawPass.postprocessing.target.texture
-                : this.drawPass.colorTarget.texture;
+        if (props.antialiasing.name !== 'off')
+            input = this.internalTarget.texture;
         this.cas.update(input, props.sharpening.params);
         this.cas.render(camera.viewport, target);
     }
-    render(camera, toDrawingBuffer, props) {
+    render(camera, input, toDrawingBuffer, props) {
         if (props.antialiasing.name === 'off' && props.sharpening.name === 'off')
             return;
         if (props.antialiasing.name === 'smaa' && !this.smaa.supported) {
             console.error('SMAA not supported, missing "HTMLImageElement"');
             return;
         }
-        const target = toDrawingBuffer ? undefined : this.target;
+        const target = toDrawingBuffer === true
+            ? undefined : toDrawingBuffer === false
+            ? this.target : toDrawingBuffer;
         if (props.sharpening.name === 'off') {
-            this._renderAntialiasing(camera, target, props);
+            this._renderAntialiasing(camera, input, target, props);
         }
         else if (props.antialiasing.name === 'off') {
-            this._renderCas(camera, target, props);
+            this._renderCas(camera, input, target, props);
         }
         else {
-            this._renderAntialiasing(camera, this.internalTarget, props);
-            this._renderCas(camera, target, props);
+            this._renderAntialiasing(camera, input, this.internalTarget, props);
+            this._renderCas(camera, input, target, props);
         }
     }
 }

package/lib/commonjs/mol-geo/geometry/base.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2023 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -61,6 +61,7 @@ export declare namespace BaseGeometry {
                 scale: any;
             }>[];
         }>>;
+        emissive: PD.Numeric;
         instanceGranularity: PD.BooleanParam;
         lod: PD.Vec3;
         cellSize: PD.Numeric;
@@ -87,6 +88,7 @@ export declare namespace BaseGeometry {
         uMetalness: ValueCell<number, never>;
         uRoughness: ValueCell<number, never>;
         uBumpiness: ValueCell<number, never>;
+        uEmissive: ValueCell<number, never>;
         dLightCount: ValueCell<number, never>;
         dColorMarker: ValueCell<boolean, never>;
         dClipObjectCount: ValueCell<number, never>;

package/lib/commonjs/mol-geo/geometry/base.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2018-2023 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -81,6 +81,7 @@ var BaseGeometry;
         quality: param_definition_1.ParamDefinition.Select('auto', exports.VisualQualityOptions, { isEssential: true, description: 'Visual/rendering quality of the representation.' }),
         material: material_1.Material.getParam(),
         clip: param_definition_1.ParamDefinition.Group(clip_1.Clip.Params),
+        emissive: param_definition_1.ParamDefinition.Numeric(0, { min: 0, max: 1, step: 0.01 }),
         instanceGranularity: param_definition_1.ParamDefinition.Boolean(false, { description: 'Use instance granularity for marker, transparency, clipping, overpaint, substance data to save memory.' }),
         lod: param_definition_1.ParamDefinition.Vec3((0, vec3_1.Vec3)(), undefined, { ...BaseGeometry.CullingLodCategory, description: 'Level of detail.', fieldLabels: { x: 'Min Distance', y: 'Max Distance', z: 'Overlap (Shader)' } }),
         cellSize: param_definition_1.ParamDefinition.Numeric(200, { min: 0, max: 5000, step: 100 }, { ...BaseGeometry.CullingLodCategory, description: 'Instance grid cell size.' }),
@@ -108,6 +109,7 @@ var BaseGeometry;
             uMetalness: mol_util_1.ValueCell.create(props.material.metalness),
             uRoughness: mol_util_1.ValueCell.create(props.material.roughness),
             uBumpiness: mol_util_1.ValueCell.create(props.material.bumpiness),
+            uEmissive: mol_util_1.ValueCell.create(props.emissive),
             dLightCount: mol_util_1.ValueCell.create(1),
             dColorMarker: mol_util_1.ValueCell.create(true),
             dClipObjectCount: mol_util_1.ValueCell.create(clip.objects.count),
@@ -127,6 +129,7 @@ var BaseGeometry;
         mol_util_1.ValueCell.updateIfChanged(values.uMetalness, props.material.metalness);
         mol_util_1.ValueCell.updateIfChanged(values.uRoughness, props.material.roughness);
         mol_util_1.ValueCell.updateIfChanged(values.uBumpiness, props.material.bumpiness);
+        mol_util_1.ValueCell.updateIfChanged(values.uEmissive, props.emissive);
         const clip = clip_1.Clip.getClip(props.clip);
         mol_util_1.ValueCell.updateIfChanged(values.dClipObjectCount, clip.objects.count);
         mol_util_1.ValueCell.updateIfChanged(values.dClipVariant, clip.variant);

package/lib/commonjs/mol-geo/geometry/cylinders/cylinders.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020-2023 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Gianluca Tomasello <giagitom@gmail.com>
@@ -73,6 +73,7 @@ export declare namespace Cylinders {
                 scale: any;
             }>[];
         }>>;
+        emissive: PD.Numeric;
         instanceGranularity: PD.BooleanParam;
         lod: PD.Vec3;
         cellSize: PD.Numeric;

package/lib/commonjs/mol-geo/geometry/cylinders/cylinders.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2020-2023 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Gianluca Tomasello <giagitom@gmail.com>
@@ -23,6 +23,7 @@ const transparency_data_1 = require("../transparency-data");
 const util_3 = require("../../../mol-data/util");
 const clipping_data_1 = require("../clipping-data");
 const substance_data_1 = require("../substance-data");
+const emissive_data_1 = require("../emissive-data");
 var Cylinders;
 (function (Cylinders) {
     function create(mappings, indices, groups, starts, ends, scales, caps, colorModes, cylinderCount, cylinders) {
@@ -167,6 +168,7 @@ var Cylinders;
             : (0, marker_data_1.createMarkers)(instanceCount * groupCount, 'groupInstance');
         const overpaint = (0, overpaint_data_1.createEmptyOverpaint)();
         const transparency = (0, transparency_data_1.createEmptyTransparency)();
+        const emissive = (0, emissive_data_1.createEmptyEmissive)();
         const material = (0, substance_data_1.createEmptySubstance)();
         const clipping = (0, clipping_data_1.createEmptyClipping)();
         const counts = { drawCount: cylinders.cylinderCount * 4 * 3, vertexCount: cylinders.cylinderCount * 6, groupCount, instanceCount };
@@ -191,6 +193,7 @@ var Cylinders;
             ...marker,
             ...overpaint,
             ...transparency,
+            ...emissive,
             ...material,
             ...clipping,
             ...transform,

package/lib/commonjs/mol-geo/geometry/direct-volume/direct-volume.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2023 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -55,6 +55,7 @@ export declare namespace DirectVolume {
                 scale: any;
             }>[];
         }>>;
+        emissive: PD.Numeric;
         instanceGranularity: PD.BooleanParam;
         lod: PD.Vec3;
         cellSize: PD.Numeric;

package/lib/commonjs/mol-geo/geometry/direct-volume/direct-volume.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2018-2023 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -24,6 +24,7 @@ const transfer_function_1 = require("./transfer-function");
 const clipping_data_1 = require("../clipping-data");
 const volume_1 = require("../../../mol-model/volume");
 const substance_data_1 = require("../substance-data");
+const emissive_data_1 = require("../emissive-data");
 const VolumeBox = (0, box_1.Box)();
 var DirectVolume;
 (function (DirectVolume) {
@@ -172,6 +173,7 @@ var DirectVolume;
             : (0, marker_data_1.createMarkers)(instanceCount * groupCount, 'groupInstance');
         const overpaint = (0, overpaint_data_1.createEmptyOverpaint)();
         const transparency = (0, transparency_data_1.createEmptyTransparency)();
+        const emissive = (0, emissive_data_1.createEmptyEmissive)();
         const material = (0, substance_data_1.createEmptySubstance)();
         const clipping = (0, clipping_data_1.createEmptyClipping)();
         const [x, y, z] = gridDimension.ref.value;
@@ -186,6 +188,7 @@ var DirectVolume;
             ...marker,
             ...overpaint,
             ...transparency,
+            ...emissive,
             ...material,
             ...clipping,
             ...transform,

package/lib/commonjs/mol-geo/geometry/emissive-data.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author Alexander Rose <alexander.rose@weirdbyte.de>
+ */
+import { ValueCell } from '../../mol-util/value-cell';
+import { Vec2, Vec3, Vec4 } from '../../mol-math/linear-algebra';
+import { TextureImage } from '../../mol-gl/renderable/util';
+import { Texture } from '../../mol-gl/webgl/texture';
+export type EmissiveType = 'instance' | 'groupInstance' | 'volumeInstance';
+export type EmissiveData = {
+    tEmissive: ValueCell<TextureImage<Uint8Array>>;
+    uEmissiveTexDim: ValueCell<Vec2>;
+    dEmissive: ValueCell<boolean>;
+    emissiveAverage: ValueCell<number>;
+    tEmissiveGrid: ValueCell<Texture>;
+    uEmissiveGridDim: ValueCell<Vec3>;
+    uEmissiveGridTransform: ValueCell<Vec4>;
+    dEmissiveType: ValueCell<string>;
+    uEmissiveStrength: ValueCell<number>;
+};
+export declare function applyEmissiveValue(array: Uint8Array, start: number, end: number, value: number): boolean;
+export declare function getEmissiveAverage(array: Uint8Array, count: number): number;
+export declare function clearEmissive(array: Uint8Array, start: number, end: number): void;
+export declare function createEmissive(count: number, type: EmissiveType, emissiveData?: EmissiveData): EmissiveData;
+export declare function createEmptyEmissive(emissiveData?: EmissiveData): EmissiveData;

package/lib/commonjs/mol-geo/geometry/emissive-data.js

@@ -0,0 +1,80 @@
+"use strict";
+/**
+ * Copyright (c) 2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author Alexander Rose <alexander.rose@weirdbyte.de>
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createEmptyEmissive = exports.createEmissive = exports.clearEmissive = exports.getEmissiveAverage = exports.applyEmissiveValue = void 0;
+const value_cell_1 = require("../../mol-util/value-cell");
+const linear_algebra_1 = require("../../mol-math/linear-algebra");
+const util_1 = require("../../mol-gl/renderable/util");
+const texture_1 = require("../../mol-gl/webgl/texture");
+function applyEmissiveValue(array, start, end, value) {
+    for (let i = start; i < end; ++i) {
+        array[i] = value * 255;
+    }
+    return true;
+}
+exports.applyEmissiveValue = applyEmissiveValue;
+function getEmissiveAverage(array, count) {
+    if (count === 0 || array.length < count)
+        return 0;
+    let sum = 0;
+    for (let i = 0; i < count; ++i) {
+        sum += array[i];
+    }
+    return sum / (255 * count);
+}
+exports.getEmissiveAverage = getEmissiveAverage;
+function clearEmissive(array, start, end) {
+    array.fill(0, start, end);
+}
+exports.clearEmissive = clearEmissive;
+function createEmissive(count, type, emissiveData) {
+    const emissive = (0, util_1.createTextureImage)(Math.max(1, count), 1, Uint8Array, emissiveData && emissiveData.tEmissive.ref.value.array);
+    if (emissiveData) {
+        value_cell_1.ValueCell.update(emissiveData.tEmissive, emissive);
+        value_cell_1.ValueCell.update(emissiveData.uEmissiveTexDim, linear_algebra_1.Vec2.create(emissive.width, emissive.height));
+        value_cell_1.ValueCell.updateIfChanged(emissiveData.dEmissive, count > 0);
+        value_cell_1.ValueCell.updateIfChanged(emissiveData.emissiveAverage, getEmissiveAverage(emissive.array, count));
+        value_cell_1.ValueCell.updateIfChanged(emissiveData.dEmissiveType, type);
+        return emissiveData;
+    }
+    else {
+        return {
+            tEmissive: value_cell_1.ValueCell.create(emissive),
+            uEmissiveTexDim: value_cell_1.ValueCell.create(linear_algebra_1.Vec2.create(emissive.width, emissive.height)),
+            dEmissive: value_cell_1.ValueCell.create(count > 0),
+            emissiveAverage: value_cell_1.ValueCell.create(0),
+            tEmissiveGrid: value_cell_1.ValueCell.create((0, texture_1.createNullTexture)()),
+            uEmissiveGridDim: value_cell_1.ValueCell.create(linear_algebra_1.Vec3.create(1, 1, 1)),
+            uEmissiveGridTransform: value_cell_1.ValueCell.create(linear_algebra_1.Vec4.create(0, 0, 0, 1)),
+            dEmissiveType: value_cell_1.ValueCell.create(type),
+            uEmissiveStrength: value_cell_1.ValueCell.create(1),
+        };
+    }
+}
+exports.createEmissive = createEmissive;
+const emptyEmissiveTexture = { array: new Uint8Array(1), width: 1, height: 1 };
+function createEmptyEmissive(emissiveData) {
+    if (emissiveData) {
+        value_cell_1.ValueCell.update(emissiveData.tEmissive, emptyEmissiveTexture);
+        value_cell_1.ValueCell.update(emissiveData.uEmissiveTexDim, linear_algebra_1.Vec2.create(1, 1));
+        return emissiveData;
+    }
+    else {
+        return {
+            tEmissive: value_cell_1.ValueCell.create(emptyEmissiveTexture),
+            uEmissiveTexDim: value_cell_1.ValueCell.create(linear_algebra_1.Vec2.create(1, 1)),
+            dEmissive: value_cell_1.ValueCell.create(false),
+            emissiveAverage: value_cell_1.ValueCell.create(0),
+            tEmissiveGrid: value_cell_1.ValueCell.create((0, texture_1.createNullTexture)()),
+            uEmissiveGridDim: value_cell_1.ValueCell.create(linear_algebra_1.Vec3.create(1, 1, 1)),
+            uEmissiveGridTransform: value_cell_1.ValueCell.create(linear_algebra_1.Vec4.create(0, 0, 0, 1)),
+            dEmissiveType: value_cell_1.ValueCell.create('groupInstance'),
+            uEmissiveStrength: value_cell_1.ValueCell.create(1),
+        };
+    }
+}
+exports.createEmptyEmissive = createEmptyEmissive;

package/lib/commonjs/mol-geo/geometry/image/image.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020-2023 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -49,6 +49,7 @@ declare namespace Image {
                 scale: any;
             }>[];
         }>>;
+        emissive: PD.Numeric;
         instanceGranularity: PD.BooleanParam;
         lod: PD.Vec3;
         cellSize: PD.Numeric;

package/lib/commonjs/mol-geo/geometry/image/image.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2020-2023 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -23,6 +23,7 @@ const clipping_data_1 = require("../clipping-data");
 const location_1 = require("../../../mol-model/location");
 const util_3 = require("../../../mol-gl/compute/util");
 const substance_data_1 = require("../substance-data");
+const emissive_data_1 = require("../emissive-data");
 const QuadIndices = new Uint32Array([
     0, 1, 2,
     1, 3, 2
@@ -116,6 +117,7 @@ var Image;
             : (0, marker_data_1.createMarkers)(instanceCount * groupCount, 'groupInstance');
         const overpaint = (0, overpaint_data_1.createEmptyOverpaint)();
         const transparency = (0, transparency_data_1.createEmptyTransparency)();
+        const emissive = (0, emissive_data_1.createEmptyEmissive)();
         const material = (0, substance_data_1.createEmptySubstance)();
         const clipping = (0, clipping_data_1.createEmptyClipping)();
         const counts = { drawCount: QuadIndices.length, vertexCount: util_3.QuadPositions.length / 3, groupCount, instanceCount };
@@ -127,6 +129,7 @@ var Image;
             ...marker,
             ...overpaint,
             ...transparency,
+            ...emissive,
             ...material,
             ...clipping,
             ...transform,

package/lib/commonjs/mol-geo/geometry/lines/lines.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2023 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -42,9 +42,9 @@ export declare namespace Lines {
         alpha: PD.Numeric;
         quality: PD.Select<"auto" | "medium" | "high" | "low" | "custom" | "highest" | "higher" | "lower" | "lowest">;
         material: PD.Group<PD.Normalize<{
+            /** Wide line */
             metalness: number;
             roughness: number;
-            /** Number of lines */
             bumpiness: number;
         }>>;
         clip: PD.Group<PD.Normalize<{
@@ -57,6 +57,7 @@ export declare namespace Lines {
                 scale: any;
             }>[];
         }>>;
+        emissive: PD.Numeric;
         instanceGranularity: PD.BooleanParam;
         lod: PD.Vec3;
         cellSize: PD.Numeric;

package/lib/commonjs/mol-geo/geometry/lines/lines.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2018-2023 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -23,6 +23,7 @@ const transparency_data_1 = require("../transparency-data");
 const util_3 = require("../../../mol-data/util");
 const clipping_data_1 = require("../clipping-data");
 const substance_data_1 = require("../substance-data");
+const emissive_data_1 = require("../emissive-data");
 var Lines;
 (function (Lines) {
     function create(mappings, indices, groups, starts, ends, lineCount, lines) {
@@ -168,6 +169,7 @@ var Lines;
             : (0, marker_data_1.createMarkers)(instanceCount * groupCount, 'groupInstance');
         const overpaint = (0, overpaint_data_1.createEmptyOverpaint)();
         const transparency = (0, transparency_data_1.createEmptyTransparency)();
+        const emissive = (0, emissive_data_1.createEmptyEmissive)();
         const material = (0, substance_data_1.createEmptySubstance)();
         const clipping = (0, clipping_data_1.createEmptyClipping)();
         const counts = { drawCount: lines.lineCount * 2 * 3, vertexCount: lines.lineCount * 4, groupCount, instanceCount };
@@ -188,6 +190,7 @@ var Lines;
             ...marker,
             ...overpaint,
             ...transparency,
+            ...emissive,
             ...material,
             ...clipping,
             ...transform,

package/lib/commonjs/mol-geo/geometry/mesh/color-smoothing.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2021-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -59,5 +59,6 @@ export declare function getTrilinearlyInterpolated(input: ColorInterpolationInpu
 export declare function applyMeshColorSmoothing(values: MeshValues, resolution: number, stride: number, webgl?: WebGLContext, colorTexture?: Texture): void;
 export declare function applyMeshOverpaintSmoothing(values: MeshValues, resolution: number, stride: number, webgl?: WebGLContext, colorTexture?: Texture): void;
 export declare function applyMeshTransparencySmoothing(values: MeshValues, resolution: number, stride: number, webgl?: WebGLContext, colorTexture?: Texture): void;
+export declare function applyMeshEmissiveSmoothing(values: MeshValues, resolution: number, stride: number, webgl?: WebGLContext, colorTexture?: Texture): void;
 export declare function applyMeshSubstanceSmoothing(values: MeshValues, resolution: number, stride: number, webgl?: WebGLContext, colorTexture?: Texture): void;
 export {};

package/lib/commonjs/mol-geo/geometry/mesh/color-smoothing.js

@@ -1,11 +1,11 @@
 "use strict";
 /**
- * Copyright (c) 2021-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2021-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyMeshSubstanceSmoothing = exports.applyMeshTransparencySmoothing = exports.applyMeshOverpaintSmoothing = exports.applyMeshColorSmoothing = exports.getTrilinearlyInterpolated = exports.calcMeshColorSmoothing = void 0;
+exports.applyMeshSubstanceSmoothing = exports.applyMeshEmissiveSmoothing = exports.applyMeshTransparencySmoothing = exports.applyMeshOverpaintSmoothing = exports.applyMeshColorSmoothing = exports.getTrilinearlyInterpolated = exports.calcMeshColorSmoothing = void 0;
 const util_1 = require("../../../mol-gl/renderable/util");
 const geometry_1 = require("../../../mol-math/geometry");
 const interpolate_1 = require("../../../mol-math/interpolate");
@@ -290,6 +290,40 @@ function applyMeshTransparencySmoothing(values, resolution, stride, webgl, color
     }
 }
 exports.applyMeshTransparencySmoothing = applyMeshTransparencySmoothing;
+function isSupportedEmissiveType(x) {
+    return x === 'groupInstance';
+}
+function applyMeshEmissiveSmoothing(values, resolution, stride, webgl, colorTexture) {
+    if (!isSupportedEmissiveType(values.dEmissiveType.ref.value))
+        return;
+    const smoothingData = calcMeshColorSmoothing({
+        vertexCount: values.uVertexCount.ref.value,
+        instanceCount: values.uInstanceCount.ref.value,
+        groupCount: values.uGroupCount.ref.value,
+        transformBuffer: values.aTransform.ref.value,
+        instanceBuffer: values.aInstance.ref.value,
+        positionBuffer: values.aPosition.ref.value,
+        groupBuffer: values.aGroup.ref.value,
+        colorData: values.tEmissive.ref.value,
+        colorType: values.dEmissiveType.ref.value,
+        boundingSphere: values.boundingSphere.ref.value,
+        invariantBoundingSphere: values.invariantBoundingSphere.ref.value,
+        itemSize: 1
+    }, resolution, stride, webgl, colorTexture);
+    if (smoothingData.kind === 'volume') {
+        mol_util_1.ValueCell.updateIfChanged(values.dEmissiveType, smoothingData.type);
+        mol_util_1.ValueCell.update(values.tEmissiveGrid, smoothingData.texture);
+        mol_util_1.ValueCell.update(values.uEmissiveTexDim, smoothingData.gridTexDim);
+        mol_util_1.ValueCell.update(values.uEmissiveGridDim, smoothingData.gridDim);
+        mol_util_1.ValueCell.update(values.uEmissiveGridTransform, smoothingData.gridTransform);
+    }
+    else if (smoothingData.kind === 'vertex') {
+        mol_util_1.ValueCell.updateIfChanged(values.dEmissiveType, smoothingData.type);
+        mol_util_1.ValueCell.update(values.tEmissive, smoothingData.texture);
+        mol_util_1.ValueCell.update(values.uEmissiveTexDim, smoothingData.texDim);
+    }
+}
+exports.applyMeshEmissiveSmoothing = applyMeshEmissiveSmoothing;
 function isSupportedSubstanceType(x) {
     return x === 'groupInstance';
 }

package/lib/commonjs/mol-geo/geometry/mesh/mesh.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2023 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author David Sehnal <david.sehnal@gmail.com>
@@ -84,6 +84,7 @@ export declare namespace Mesh {
                 scale: any;
             }>[];
         }>>;
+        emissive: PD.Numeric;
         instanceGranularity: PD.BooleanParam;
         lod: PD.Vec3;
         cellSize: PD.Numeric;