molstar 4.0.1 → 4.2.0

package/lib/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/mol-geo/geometry/lines/lines.js

@@ -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>
  */
@@ -20,6 +20,7 @@ import { createEmptyTransparency } from '../transparency-data';
 import { hashFnv32a } from '../../../mol-data/util';
 import { createEmptyClipping } from '../clipping-data';
 import { createEmptySubstance } from '../substance-data';
+import { createEmptyEmissive } from '../emissive-data';
 export var Lines;
 (function (Lines) {
     function create(mappings, indices, groups, starts, ends, lineCount, lines) {
@@ -165,6 +166,7 @@ export var Lines;
             : createMarkers(instanceCount * groupCount, 'groupInstance');
         const overpaint = createEmptyOverpaint();
         const transparency = createEmptyTransparency();
+        const emissive = createEmptyEmissive();
         const material = createEmptySubstance();
         const clipping = createEmptyClipping();
         const counts = { drawCount: lines.lineCount * 2 * 3, vertexCount: lines.lineCount * 4, groupCount, instanceCount };
@@ -185,6 +187,7 @@ export var Lines;
             ...marker,
             ...overpaint,
             ...transparency,
+            ...emissive,
             ...material,
             ...clipping,
             ...transform,

package/lib/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/mol-geo/geometry/mesh/color-smoothing.js

@@ -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>
  */
@@ -282,6 +282,39 @@ export function applyMeshTransparencySmoothing(values, resolution, stride, webgl
         ValueCell.update(values.uTransparencyTexDim, smoothingData.texDim);
     }
 }
+function isSupportedEmissiveType(x) {
+    return x === 'groupInstance';
+}
+export 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') {
+        ValueCell.updateIfChanged(values.dEmissiveType, smoothingData.type);
+        ValueCell.update(values.tEmissiveGrid, smoothingData.texture);
+        ValueCell.update(values.uEmissiveTexDim, smoothingData.gridTexDim);
+        ValueCell.update(values.uEmissiveGridDim, smoothingData.gridDim);
+        ValueCell.update(values.uEmissiveGridTransform, smoothingData.gridTransform);
+    }
+    else if (smoothingData.kind === 'vertex') {
+        ValueCell.updateIfChanged(values.dEmissiveType, smoothingData.type);
+        ValueCell.update(values.tEmissive, smoothingData.texture);
+        ValueCell.update(values.uEmissiveTexDim, smoothingData.texDim);
+    }
+}
 function isSupportedSubstanceType(x) {
     return x === 'groupInstance';
 }

package/lib/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;

package/lib/mol-geo/geometry/mesh/mesh.js

@@ -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>
@@ -21,6 +21,7 @@ import { createEmptyClipping } from '../clipping-data';
 import { arraySetAdd } from '../../../mol-util/array';
 import { degToRad } from '../../../mol-math/misc';
 import { createEmptySubstance } from '../substance-data';
+import { createEmptyEmissive } from '../emissive-data';
 export var Mesh;
 (function (Mesh) {
     function create(vertices, indices, normals, groups, vertexCount, triangleCount, mesh) {
@@ -569,14 +570,18 @@ export var Mesh;
         const instanceCount = transform.instanceCount.ref.value;
         const location = PositionLocation();
         const p = location.position;
-        const v = mesh.vertexBuffer.ref.value;
+        const n = location.normal;
+        const vs = mesh.vertexBuffer.ref.value;
+        const ns = mesh.normalBuffer.ref.value;
         const m = transform.aTransform.ref.value;
         const getLocation = (groupIndex, instanceIndex) => {
             if (instanceIndex < 0) {
-                Vec3.fromArray(p, v, groupIndex * 3);
+                Vec3.fromArray(p, vs, groupIndex * 3);
+                Vec3.fromArray(n, ns, groupIndex * 3);
             }
             else {
-                Vec3.transformMat4Offset(p, v, m, 0, groupIndex * 3, instanceIndex * 16);
+                Vec3.transformMat4Offset(p, vs, m, 0, groupIndex * 3, instanceIndex * 16);
+                Vec3.transformDirectionOffset(n, ns, m, 0, groupIndex * 3, instanceIndex * 16);
             }
             return location;
         };
@@ -591,6 +596,7 @@ export var Mesh;
             : createMarkers(instanceCount * groupCount, 'groupInstance');
         const overpaint = createEmptyOverpaint();
         const transparency = createEmptyTransparency();
+        const emissive = createEmptyEmissive();
         const material = createEmptySubstance();
         const clipping = createEmptyClipping();
         const counts = { drawCount: mesh.triangleCount * 3, vertexCount: mesh.vertexCount, groupCount, instanceCount };
@@ -610,6 +616,7 @@ export var Mesh;
             ...marker,
             ...overpaint,
             ...transparency,
+            ...emissive,
             ...material,
             ...clipping,
             ...transform,

package/lib/mol-geo/geometry/points/points.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,7 +42,7 @@ export declare namespace Points {
         alpha: PD.Numeric;
         quality: PD.Select<"auto" | "medium" | "high" | "low" | "custom" | "highest" | "higher" | "lower" | "lowest">;
         material: PD.Group<PD.Normalize<{
-            metalness: number; /** Number of vertices in the point cloud */
+            metalness: number;
             roughness: number;
             bumpiness: number;
         }>>;
@@ -56,6 +56,7 @@ export declare namespace Points {
                 scale: any;
             }>[];
         }>>;
+        emissive: PD.Numeric;
         instanceGranularity: PD.BooleanParam;
         lod: PD.Vec3;
         cellSize: PD.Numeric;

package/lib/mol-geo/geometry/points/points.js

@@ -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>
  */
@@ -19,6 +19,7 @@ import { createEmptyTransparency } from '../transparency-data';
 import { hashFnv32a } from '../../../mol-data/util';
 import { createEmptyClipping } from '../clipping-data';
 import { createEmptySubstance } from '../substance-data';
+import { createEmptyEmissive } from '../emissive-data';
 export var Points;
 (function (Points) {
     function create(centers, groups, pointCount, points) {
@@ -135,6 +136,7 @@ export var Points;
             : createMarkers(instanceCount * groupCount, 'groupInstance');
         const overpaint = createEmptyOverpaint();
         const transparency = createEmptyTransparency();
+        const emissive = createEmptyEmissive();
         const material = createEmptySubstance();
         const clipping = createEmptyClipping();
         const counts = { drawCount: points.pointCount, vertexCount: points.pointCount, groupCount, instanceCount };
@@ -152,6 +154,7 @@ export var Points;
             ...marker,
             ...overpaint,
             ...transparency,
+            ...emissive,
             ...material,
             ...clipping,
             ...transform,

package/lib/mol-geo/geometry/spheres/spheres.d.ts

@@ -1,5 +1,5 @@
 /**
- * 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>
  */
@@ -70,7 +70,6 @@ export declare namespace Spheres {
         material: PD.Group<PD.Normalize<{
             metalness: number;
             roughness: number;
-            /** Number of spheres */
             bumpiness: number;
         }>>;
         clip: PD.Group<PD.Normalize<{
@@ -83,6 +82,7 @@ export declare namespace Spheres {
                 scale: any;
             }>[];
         }>>;
+        emissive: PD.Numeric;
         instanceGranularity: PD.BooleanParam;
         lod: PD.Vec3;
         cellSize: PD.Numeric;

package/lib/mol-geo/geometry/spheres/spheres.js

@@ -1,5 +1,5 @@
 /**
- * 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>
  */
@@ -19,6 +19,7 @@ import { createGroupMapping } from '../../util';
 import { createEmptyClipping } from '../clipping-data';
 import { Vec2, Vec3, Vec4 } from '../../../mol-math/linear-algebra';
 import { createEmptySubstance } from '../substance-data';
+import { createEmptyEmissive } from '../emissive-data';
 export var Spheres;
 (function (Spheres) {
     function create(centers, groups, sphereCount, spheres) {
@@ -57,7 +58,7 @@ export var Spheres;
             get boundingSphere() {
                 const newHash = hashCode(spheres);
                 if (newHash !== currentHash) {
-                    const b = calculateInvariantBoundingSphere(spheres.centerBuffer.ref.value, spheres.sphereCount * 4, 4);
+                    const b = calculateInvariantBoundingSphere(spheres.centerBuffer.ref.value, spheres.sphereCount, 1);
                     Sphere3D.copy(boundingSphere, b);
                     currentHash = newHash;
                 }
@@ -65,7 +66,7 @@ export var Spheres;
             },
             get groupMapping() {
                 if (spheres.groupBuffer.ref.version !== currentGroup) {
-                    groupMapping = createGroupMapping(spheres.groupBuffer.ref.value, spheres.sphereCount, 4);
+                    groupMapping = createGroupMapping(spheres.groupBuffer.ref.value, spheres.sphereCount);
                     currentGroup = spheres.groupBuffer.ref.version;
                 }
                 return groupMapping;
@@ -94,6 +95,7 @@ export var Spheres;
                 }
             },
         };
+        spheres.shaderData.update();
         return spheres;
     }
     function update(centers, groups, sphereCount, spheres) {
@@ -247,6 +249,7 @@ export var Spheres;
             : createMarkers(instanceCount * groupCount, 'groupInstance');
         const overpaint = createEmptyOverpaint();
         const transparency = createEmptyTransparency();
+        const emissive = createEmptyEmissive();
         const material = createEmptySubstance();
         const clipping = createEmptyClipping();
         const counts = { drawCount: spheres.sphereCount * 2 * 3, vertexCount: spheres.sphereCount * 6, groupCount, instanceCount };
@@ -266,6 +269,7 @@ export var Spheres;
             ...marker,
             ...overpaint,
             ...transparency,
+            ...emissive,
             ...material,
             ...clipping,
             ...transform,

package/lib/mol-geo/geometry/text/text.d.ts

@@ -1,5 +1,5 @@
 /**
- * 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>
  */
@@ -75,6 +75,7 @@ export declare namespace Text {
                 scale: any;
             }>[];
         }>>;
+        emissive: PD.Numeric;
         instanceGranularity: PD.BooleanParam;
         lod: PD.Vec3;
         cellSize: PD.Numeric;

package/lib/mol-geo/geometry/text/text.js

@@ -1,5 +1,5 @@
 /**
- * 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>
  */
@@ -23,6 +23,7 @@ import { hashFnv32a } from '../../../mol-data/util';
 import { createGroupMapping } from '../../util';
 import { createEmptyClipping } from '../clipping-data';
 import { createEmptySubstance } from '../substance-data';
+import { createEmptyEmissive } from '../emissive-data';
 export var Text;
 (function (Text) {
     function create(fontTexture, centers, mappings, depths, indices, groups, tcoords, charCount, text) {
@@ -160,6 +161,7 @@ export var Text;
             : createMarkers(instanceCount * groupCount, 'groupInstance');
         const overpaint = createEmptyOverpaint();
         const transparency = createEmptyTransparency();
+        const emissive = createEmptyEmissive();
         const substance = createEmptySubstance();
         const clipping = createEmptyClipping();
         const counts = { drawCount: text.charCount * 2 * 3, vertexCount: text.charCount * 4, groupCount, instanceCount };
@@ -181,6 +183,7 @@ export var Text;
             ...marker,
             ...overpaint,
             ...transparency,
+            ...emissive,
             ...substance,
             ...clipping,
             ...transform,

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021-2023 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>
  */
@@ -64,5 +64,6 @@ export declare function calcTextureMeshColorSmoothing(input: ColorSmoothingInput
 export declare function applyTextureMeshColorSmoothing(values: TextureMeshValues, resolution: number, stride: number, webgl: WebGLContext, colorTexture?: Texture): void;
 export declare function applyTextureMeshOverpaintSmoothing(values: TextureMeshValues, resolution: number, stride: number, webgl: WebGLContext, colorTexture?: Texture): void;
 export declare function applyTextureMeshTransparencySmoothing(values: TextureMeshValues, resolution: number, stride: number, webgl: WebGLContext, colorTexture?: Texture): void;
+export declare function applyTextureMeshEmissiveSmoothing(values: TextureMeshValues, resolution: number, stride: number, webgl: WebGLContext, colorTexture?: Texture): void;
 export declare function applyTextureMeshSubstanceSmoothing(values: TextureMeshValues, resolution: number, stride: number, webgl: WebGLContext, colorTexture?: Texture): void;
 export {};

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021-2023 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>
  */
@@ -411,6 +411,37 @@ export function applyTextureMeshTransparencySmoothing(values, resolution, stride
     ValueCell.update(values.uTransparencyGridDim, smoothingData.gridDim);
     ValueCell.update(values.uTransparencyGridTransform, smoothingData.gridTransform);
 }
+function isSupportedEmissiveType(x) {
+    return x === 'groupInstance';
+}
+export function applyTextureMeshEmissiveSmoothing(values, resolution, stride, webgl, colorTexture) {
+    if (!isSupportedEmissiveType(values.dEmissiveType.ref.value))
+        return;
+    stride *= 3; // triple because TextureMesh is never indexed (no elements buffer)
+    if (!webgl.namedTextures[ColorSmoothingAlphaName]) {
+        webgl.namedTextures[ColorSmoothingAlphaName] = webgl.resources.texture('image-uint8', 'alpha', 'ubyte', 'nearest');
+    }
+    const colorData = webgl.namedTextures[ColorSmoothingAlphaName];
+    colorData.load(values.tEmissive.ref.value);
+    const smoothingData = calcTextureMeshColorSmoothing({
+        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,
+        positionTexture: values.tPosition.ref.value,
+        groupTexture: values.tGroup.ref.value,
+        colorData,
+        colorType: values.dEmissiveType.ref.value,
+        boundingSphere: values.boundingSphere.ref.value,
+        invariantBoundingSphere: values.invariantBoundingSphere.ref.value,
+    }, resolution, stride, webgl, colorTexture);
+    ValueCell.updateIfChanged(values.dEmissiveType, smoothingData.type);
+    ValueCell.update(values.tEmissiveGrid, smoothingData.texture);
+    ValueCell.update(values.uEmissiveTexDim, smoothingData.gridTexDim);
+    ValueCell.update(values.uEmissiveGridDim, smoothingData.gridDim);
+    ValueCell.update(values.uEmissiveGridTransform, smoothingData.gridTransform);
+}
 function isSupportedSubstanceType(x) {
     return x === 'groupInstance';
 }

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

@@ -1,7 +1,8 @@
 /**
- * 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 Cai Huiyu <szmun.caihy@gmail.com>
  */
 import { ValueCell } from '../../../mol-util';
 import { Sphere3D } from '../../../mol-math/geometry';
@@ -68,6 +69,7 @@ export declare namespace TextureMesh {
                 scale: any;
             }>[];
         }>>;
+        emissive: PD.Numeric;
         instanceGranularity: PD.BooleanParam;
         lod: PD.Vec3;
         cellSize: PD.Numeric;

package/lib/mol-geo/geometry/texture-mesh/texture-mesh.js

@@ -1,7 +1,8 @@
 /**
- * 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 Cai Huiyu <szmun.caihy@gmail.com>
  */
 import { ValueCell } from '../../../mol-util';
 import { Sphere3D } from '../../../mol-math/geometry';
@@ -18,6 +19,7 @@ import { Vec2, Vec3, Vec4 } from '../../../mol-math/linear-algebra';
 import { createEmptyClipping } from '../clipping-data';
 import { NullLocation } from '../../../mol-model/location';
 import { createEmptySubstance } from '../substance-data';
+import { createEmptyEmissive } from '../emissive-data';
 export var TextureMesh;
 (function (TextureMesh) {
     class DoubleBuffer {
@@ -118,18 +120,24 @@ export var TextureMesh;
         framebuffer.bind();
         textureMesh.vertexTexture.ref.value.attachFramebuffer(framebuffer, 0);
         webgl.readPixels(0, 0, width, height, vertices);
+        const normals = new Float32Array(width * height * 4);
+        framebuffer.bind();
+        textureMesh.normalTexture.ref.value.attachFramebuffer(framebuffer, 0);
+        webgl.readPixels(0, 0, width, height, normals);
         const groupCount = textureMesh.vertexCount;
         const instanceCount = transform.instanceCount.ref.value;
         const location = PositionLocation();
         const p = location.position;
-        const v = vertices;
+        const n = location.normal;
         const m = transform.aTransform.ref.value;
         const getLocation = (groupIndex, instanceIndex) => {
             if (instanceIndex < 0) {
-                Vec3.fromArray(p, v, groupIndex * 4);
+                Vec3.fromArray(p, vertices, groupIndex * 4);
+                Vec3.fromArray(n, normals, groupIndex * 4);
             }
             else {
-                Vec3.transformMat4Offset(p, v, m, 0, groupIndex * 4, instanceIndex * 16);
+                Vec3.transformMat4Offset(p, vertices, m, 0, groupIndex * 4, instanceIndex * 16);
+                Vec3.transformDirectionOffset(n, normals, m, 0, groupIndex * 4, instanceIndex * 16);
             }
             return location;
         };
@@ -144,6 +152,7 @@ export var TextureMesh;
             : createMarkers(instanceCount * groupCount, 'groupInstance');
         const overpaint = createEmptyOverpaint();
         const transparency = createEmptyTransparency();
+        const emissive = createEmptyEmissive();
         const substance = createEmptySubstance();
         const clipping = createEmptyClipping();
         const counts = { drawCount: textureMesh.vertexCount, vertexCount: textureMesh.vertexCount, groupCount, instanceCount };
@@ -163,6 +172,7 @@ export var TextureMesh;
             ...marker,
             ...overpaint,
             ...transparency,
+            ...emissive,
             ...substance,
             ...clipping,
             ...transform,

package/lib/mol-geo/util/location-iterator.d.ts

@@ -1,8 +1,9 @@
 /**
- * Copyright (c) 2018-2020 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 Gianluca Tomasello <giagitom@gmail.com>
+ * @author Cai Huiyu <szmun.caihy@gmail.com>
  */
 import { Iterator } from '../../mol-data';
 import { Vec3 } from '../../mol-math/linear-algebra';
@@ -36,7 +37,9 @@ export declare function LocationIterator(groupCount: number, instanceCount: numb
 export interface PositionLocation {
     readonly kind: 'position-location';
     readonly position: Vec3;
+    /** Normal vector at the position (used for surface coloring) */
+    readonly normal: Vec3;
 }
-export declare function PositionLocation(position?: Vec3): PositionLocation;
+export declare function PositionLocation(position?: Vec3, normal?: Vec3): PositionLocation;
 export declare function isPositionLocation(x: any): x is PositionLocation;
 export {};

package/lib/mol-geo/util/location-iterator.js

@@ -1,8 +1,9 @@
 /**
- * Copyright (c) 2018-2020 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 Gianluca Tomasello <giagitom@gmail.com>
+ * @author Cai Huiyu <szmun.caihy@gmail.com>
  */
 import { Vec3 } from '../../mol-math/linear-algebra';
 import { NullLocation } from '../../mol-model/location';
@@ -81,8 +82,12 @@ export function LocationIterator(groupCount, instanceCount, stride, getLocation,
         }
     };
 }
-export function PositionLocation(position) {
-    return { kind: 'position-location', position: position ? Vec3.clone(position) : Vec3() };
+export function PositionLocation(position, normal) {
+    return {
+        kind: 'position-location',
+        position: position ? Vec3.clone(position) : Vec3(),
+        normal: normal ? Vec3.clone(normal) : Vec3()
+    };
 }
 export function isPositionLocation(x) {
     return !!x && x.kind === 'position-location';

package/lib/mol-gl/renderable/cylinders.d.ts

@@ -45,6 +45,7 @@ export declare const CylindersSchema: {
     uMetalness: UniformSpec<"f">;
     uRoughness: UniformSpec<"f">;
     uBumpiness: UniformSpec<"f">;
+    uEmissive: UniformSpec<"f">;
     uVertexCount: UniformSpec<"i">;
     uInstanceCount: UniformSpec<"i">;
     uGroupCount: UniformSpec<"i">;
@@ -73,6 +74,15 @@ export declare const CylindersSchema: {
     tSubstanceGrid: import("./schema").TextureSpec<"texture">;
     dSubstanceType: DefineSpec<"string">;
     uSubstanceStrength: UniformSpec<"f">;
+    uEmissiveTexDim: UniformSpec<"v2">;
+    tEmissive: import("./schema").TextureSpec<"image-uint8">;
+    dEmissive: DefineSpec<"boolean">;
+    emissiveAverage: ValueSpec<"number">;
+    uEmissiveGridDim: UniformSpec<"v3">;
+    uEmissiveGridTransform: UniformSpec<"v4">;
+    tEmissiveGrid: import("./schema").TextureSpec<"texture">;
+    dEmissiveType: DefineSpec<"string">;
+    uEmissiveStrength: UniformSpec<"f">;
     uTransparencyTexDim: UniformSpec<"v2">;
     tTransparency: import("./schema").TextureSpec<"image-uint8">;
     dTransparency: DefineSpec<"boolean">;

package/lib/mol-gl/renderable/direct-volume.d.ts

@@ -46,6 +46,7 @@ export declare const DirectVolumeSchema: {
     uMetalness: UniformSpec<"f">;
     uRoughness: UniformSpec<"f">;
     uBumpiness: UniformSpec<"f">;
+    uEmissive: UniformSpec<"f">;
     uVertexCount: UniformSpec<"i">;
     uInstanceCount: UniformSpec<"i">;
     uGroupCount: UniformSpec<"i">;
@@ -74,6 +75,15 @@ export declare const DirectVolumeSchema: {
     tSubstanceGrid: TextureSpec<"texture">;
     dSubstanceType: DefineSpec<"string">;
     uSubstanceStrength: UniformSpec<"f">;
+    uEmissiveTexDim: UniformSpec<"v2">;
+    tEmissive: TextureSpec<"image-uint8">;
+    dEmissive: DefineSpec<"boolean">;
+    emissiveAverage: import("./schema").ValueSpec<"number">;
+    uEmissiveGridDim: UniformSpec<"v3">;
+    uEmissiveGridTransform: UniformSpec<"v4">;
+    tEmissiveGrid: TextureSpec<"texture">;
+    dEmissiveType: DefineSpec<"string">;
+    uEmissiveStrength: UniformSpec<"f">;
     uTransparencyTexDim: UniformSpec<"v2">;
     tTransparency: TextureSpec<"image-uint8">;
     dTransparency: DefineSpec<"boolean">;

package/lib/mol-gl/renderable/image.d.ts

@@ -31,6 +31,7 @@ export declare const ImageSchema: {
     uMetalness: UniformSpec<"f">;
     uRoughness: UniformSpec<"f">;
     uBumpiness: UniformSpec<"f">;
+    uEmissive: UniformSpec<"f">;
     uVertexCount: UniformSpec<"i">;
     uInstanceCount: UniformSpec<"i">;
     uGroupCount: UniformSpec<"i">;
@@ -59,6 +60,15 @@ export declare const ImageSchema: {
     tSubstanceGrid: TextureSpec<"texture">;
     dSubstanceType: DefineSpec<"string">;
     uSubstanceStrength: UniformSpec<"f">;
+    uEmissiveTexDim: UniformSpec<"v2">;
+    tEmissive: TextureSpec<"image-uint8">;
+    dEmissive: DefineSpec<"boolean">;
+    emissiveAverage: import("./schema").ValueSpec<"number">;
+    uEmissiveGridDim: UniformSpec<"v3">;
+    uEmissiveGridTransform: UniformSpec<"v4">;
+    tEmissiveGrid: TextureSpec<"texture">;
+    dEmissiveType: DefineSpec<"string">;
+    uEmissiveStrength: UniformSpec<"f">;
     uTransparencyTexDim: UniformSpec<"v2">;
     tTransparency: TextureSpec<"image-uint8">;
     dTransparency: DefineSpec<"boolean">;

package/lib/mol-gl/renderable/lines.d.ts

@@ -36,6 +36,7 @@ export declare const LinesSchema: {
     uMetalness: UniformSpec<"f">;
     uRoughness: UniformSpec<"f">;
     uBumpiness: UniformSpec<"f">;
+    uEmissive: UniformSpec<"f">;
     uVertexCount: UniformSpec<"i">;
     uInstanceCount: UniformSpec<"i">;
     uGroupCount: UniformSpec<"i">;
@@ -64,6 +65,15 @@ export declare const LinesSchema: {
     tSubstanceGrid: import("./schema").TextureSpec<"texture">;
     dSubstanceType: DefineSpec<"string">;
     uSubstanceStrength: UniformSpec<"f">;
+    uEmissiveTexDim: UniformSpec<"v2">;
+    tEmissive: import("./schema").TextureSpec<"image-uint8">;
+    dEmissive: DefineSpec<"boolean">;
+    emissiveAverage: import("./schema").ValueSpec<"number">;
+    uEmissiveGridDim: UniformSpec<"v3">;
+    uEmissiveGridTransform: UniformSpec<"v4">;
+    tEmissiveGrid: import("./schema").TextureSpec<"texture">;
+    dEmissiveType: DefineSpec<"string">;
+    uEmissiveStrength: UniformSpec<"f">;
     uTransparencyTexDim: UniformSpec<"v2">;
     tTransparency: import("./schema").TextureSpec<"image-uint8">;
     dTransparency: DefineSpec<"boolean">;