molstar 4.0.1 → 4.2.0

package/lib/commonjs/mol-gl/renderable/schema.js

@@ -1,12 +1,12 @@
 "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>
  * @author Gianluca Tomasello <giagitom@gmail.com>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseSchema = exports.ClippingSchema = exports.SubstanceSchema = exports.TransparencySchema = exports.OverpaintSchema = exports.MarkerSchema = exports.SizeSchema = exports.ColorSchema = exports.InternalSchema = exports.GlobalTextureSchema = exports.GlobalUniformSchema = exports.ValueSpec = exports.DefineSpec = exports.ElementsSpec = exports.TextureSpec = exports.UniformSpec = exports.AttributeSpec = exports.getValueVersions = exports.splitValues = void 0;
+exports.BaseSchema = exports.ClippingSchema = exports.SubstanceSchema = exports.EmissiveSchema = exports.TransparencySchema = exports.OverpaintSchema = exports.MarkerSchema = exports.SizeSchema = exports.ColorSchema = exports.InternalSchema = exports.GlobalTextureSchema = exports.GlobalUniformSchema = exports.ValueSpec = exports.DefineSpec = exports.ElementsSpec = exports.TextureSpec = exports.UniformSpec = exports.AttributeSpec = exports.getValueVersions = exports.splitValues = void 0;
 function splitValues(schema, values) {
     const attributeValues = {};
     const defineValues = {};
@@ -181,6 +181,17 @@ exports.TransparencySchema = {
     dTransparencyType: DefineSpec('string', ['instance', 'groupInstance', 'volumeInstance']),
     uTransparencyStrength: UniformSpec('f', 'material'),
 };
+exports.EmissiveSchema = {
+    uEmissiveTexDim: UniformSpec('v2'),
+    tEmissive: TextureSpec('image-uint8', 'alpha', 'ubyte', 'nearest'),
+    dEmissive: DefineSpec('boolean'),
+    emissiveAverage: ValueSpec('number'),
+    uEmissiveGridDim: UniformSpec('v3'),
+    uEmissiveGridTransform: UniformSpec('v4'),
+    tEmissiveGrid: TextureSpec('texture', 'alpha', 'ubyte', 'linear'),
+    dEmissiveType: DefineSpec('string', ['instance', 'groupInstance', 'volumeInstance']),
+    uEmissiveStrength: UniformSpec('f', 'material'),
+};
 exports.SubstanceSchema = {
     uSubstanceTexDim: UniformSpec('v2'),
     tSubstance: TextureSpec('image-uint8', 'rgba', 'ubyte', 'nearest'),
@@ -203,6 +214,7 @@ exports.BaseSchema = {
     ...exports.MarkerSchema,
     ...exports.OverpaintSchema,
     ...exports.TransparencySchema,
+    ...exports.EmissiveSchema,
     ...exports.SubstanceSchema,
     ...exports.ClippingSchema,
     dLightCount: DefineSpec('number'),
@@ -227,6 +239,7 @@ exports.BaseSchema = {
     uMetalness: UniformSpec('f', 'material'),
     uRoughness: UniformSpec('f', 'material'),
     uBumpiness: UniformSpec('f', 'material'),
+    uEmissive: UniformSpec('f', 'material'),
     uVertexCount: UniformSpec('i'),
     uInstanceCount: UniformSpec('i'),
     uGroupCount: UniformSpec('i'),

package/lib/commonjs/mol-gl/renderable/spheres.d.ts

@@ -44,6 +44,7 @@ export declare const SpheresSchema: {
     uMetalness: UniformSpec<"f">;
     uRoughness: UniformSpec<"f">;
     uBumpiness: UniformSpec<"f">;
+    uEmissive: UniformSpec<"f">;
     uVertexCount: UniformSpec<"i">;
     uInstanceCount: UniformSpec<"i">;
     uGroupCount: UniformSpec<"i">;
@@ -72,6 +73,15 @@ export declare const SpheresSchema: {
     tSubstanceGrid: TextureSpec<"texture">;
     dSubstanceType: DefineSpec<"string">;
     uSubstanceStrength: UniformSpec<"f">;
+    uEmissiveTexDim: UniformSpec<"v2">;
+    tEmissive: TextureSpec<"image-uint8">;
+    dEmissive: DefineSpec<"boolean">;
+    emissiveAverage: 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/commonjs/mol-gl/renderable/text.d.ts

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

package/lib/commonjs/mol-gl/renderable/texture-mesh.d.ts

@@ -37,6 +37,7 @@ export declare const TextureMeshSchema: {
     uMetalness: UniformSpec<"f">;
     uRoughness: UniformSpec<"f">;
     uBumpiness: UniformSpec<"f">;
+    uEmissive: UniformSpec<"f">;
     uVertexCount: UniformSpec<"i">;
     uInstanceCount: UniformSpec<"i">;
     uGroupCount: UniformSpec<"i">;
@@ -65,6 +66,15 @@ export declare const TextureMeshSchema: {
     tSubstanceGrid: TextureSpec<"texture">;
     dSubstanceType: DefineSpec<"string">;
     uSubstanceStrength: UniformSpec<"f">;
+    uEmissiveTexDim: UniformSpec<"v2">;
+    tEmissive: TextureSpec<"image-uint8">;
+    dEmissive: DefineSpec<"boolean">;
+    emissiveAverage: 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/commonjs/mol-gl/renderable.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>
  */

package/lib/commonjs/mol-gl/renderable.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>
  */
@@ -78,7 +78,7 @@ function createRenderable(renderItem, values, state) {
                 return;
             if (values.instanceCount.ref.value === 0)
                 return;
-            if (!values.instanceGrid.ref.value)
+            if (values.instanceGrid.ref.value.cellSize <= 1)
                 return;
             const { cellOffsets, cellSpheres, cellCount, batchOffsets, batchSpheres, batchCount, batchCell, batchSize } = values.instanceGrid.ref.value;
             const [minDistance, maxDistance] = values.uLod.ref.value;

package/lib/commonjs/mol-gl/renderer.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 Gianluca Tomasello <giagitom@gmail.com>
@@ -48,6 +48,7 @@ interface Renderer {
     renderDepthTransparent: (group: Scene.Group, camera: ICamera, depthTexture: Texture | null) => void;
     renderMarkingDepth: (group: Scene.Group, camera: ICamera, depthTexture: Texture | null) => void;
     renderMarkingMask: (group: Scene.Group, camera: ICamera, depthTexture: Texture | null) => void;
+    renderEmissive: (group: Scene.Group, camera: ICamera, depthTexture: Texture | null) => void;
     renderBlended: (group: Scene, camera: ICamera) => void;
     renderBlendedOpaque: (group: Scene.Group, camera: ICamera, depthTexture: Texture | null) => void;
     renderBlendedTransparent: (group: Scene.Group, camera: ICamera, depthTexture: Texture | null) => void;

package/lib/commonjs/mol-gl/renderer.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>
  * @author Gianluca Tomasello <giagitom@gmail.com>
@@ -177,7 +177,8 @@ var Renderer;
                 if (d - radius > maxDistance)
                     return;
             }
-            if (r.values.instanceGrid.ref.value.cellSize > 1 || r.values.lodLevels) {
+            const hasInstanceGrid = r.values.instanceGrid.ref.value.cellSize > 1;
+            if (hasInstanceGrid || (hasInstanceGrid && r.values.lodLevels)) {
                 r.cull(cameraPlane, frustum, isOccluded, ctx.stats);
             }
             else {
@@ -304,6 +305,30 @@ var Renderer;
             globalUniformsNeedUpdate = true;
             state.currentRenderItemId = -1;
         };
+        const checkOpaque = function (r) {
+            var _a, _b, _c, _d;
+            // uAlpha is updated in `r.render` so we need to recompute it here
+            const alpha = (0, interpolate_1.clamp)(r.values.alpha.ref.value * r.state.alphaFactor, 0, 1);
+            const xrayShaded = ((_a = r.values.dXrayShaded) === null || _a === void 0 ? void 0 : _a.ref.value) === 'on' || ((_b = r.values.dXrayShaded) === null || _b === void 0 ? void 0 : _b.ref.value) === 'inverted';
+            return ((alpha === 1 &&
+                r.values.transparencyAverage.ref.value !== 1 &&
+                r.values.dGeometryType.ref.value !== 'directVolume' &&
+                ((_c = r.values.dPointStyle) === null || _c === void 0 ? void 0 : _c.ref.value) !== 'fuzzy' &&
+                !xrayShaded) || ((_d = r.values.dTransparentBackfaces) === null || _d === void 0 ? void 0 : _d.ref.value) === 'opaque');
+        };
+        const checkTransparent = function (r) {
+            var _a, _b, _c;
+            // uAlpha is updated in `r.render` so we need to recompute it here
+            const alpha = (0, interpolate_1.clamp)(r.values.alpha.ref.value * r.state.alphaFactor, 0, 1);
+            const xrayShaded = ((_a = r.values.dXrayShaded) === null || _a === void 0 ? void 0 : _a.ref.value) === 'on' || ((_b = r.values.dXrayShaded) === null || _b === void 0 ? void 0 : _b.ref.value) === 'inverted';
+            return ((alpha < 1 && alpha !== 0) ||
+                r.values.transparencyAverage.ref.value > 0 ||
+                r.values.dGeometryType.ref.value === 'directVolume' ||
+                ((_c = r.values.dPointStyle) === null || _c === void 0 ? void 0 : _c.ref.value) === 'fuzzy' ||
+                r.values.dGeometryType.ref.value === 'text' ||
+                r.values.dGeometryType.ref.value === 'image' ||
+                xrayShaded);
+        };
         const renderPick = (group, camera, variant, depthTexture, pickType) => {
             if (debug_1.isTimingMode)
                 ctx.timer.mark('Renderer.renderPick');
@@ -336,7 +361,6 @@ var Renderer;
                 ctx.timer.markEnd('Renderer.renderDepth');
         };
         const renderDepthOpaque = (group, camera, depthTexture) => {
-            var _a, _b;
             if (debug_1.isTimingMode)
                 ctx.timer.mark('Renderer.renderDepthOpaque');
             state.disable(gl.BLEND);
@@ -346,8 +370,7 @@ var Renderer;
             const { renderables } = group;
             for (let i = 0, il = renderables.length; i < il; ++i) {
                 const r = renderables[i];
-                const xrayShaded = ((_a = r.values.dXrayShaded) === null || _a === void 0 ? void 0 : _a.ref.value) === 'on' || ((_b = r.values.dXrayShaded) === null || _b === void 0 ? void 0 : _b.ref.value) === 'inverted';
-                if (r.state.opaque && r.values.transparencyAverage.ref.value !== 1 && !xrayShaded) {
+                if (checkOpaque(r)) {
                     renderObject(r, 'depth', 0 /* Flag.None */);
                 }
             }
@@ -355,7 +378,6 @@ var Renderer;
                 ctx.timer.markEnd('Renderer.renderDepthOpaque');
         };
         const renderDepthTransparent = (group, camera, depthTexture) => {
-            var _a, _b;
             if (debug_1.isTimingMode)
                 ctx.timer.mark('Renderer.renderDepthTransparent');
             state.disable(gl.BLEND);
@@ -365,8 +387,7 @@ var Renderer;
             const { renderables } = group;
             for (let i = 0, il = renderables.length; i < il; ++i) {
                 const r = renderables[i];
-                const xrayShaded = ((_a = r.values.dXrayShaded) === null || _a === void 0 ? void 0 : _a.ref.value) === 'on' || ((_b = r.values.dXrayShaded) === null || _b === void 0 ? void 0 : _b.ref.value) === 'inverted';
-                if (!r.state.opaque || r.values.transparencyAverage.ref.value > 0 || xrayShaded) {
+                if (checkTransparent(r)) {
                     renderObject(r, 'depth', 0 /* Flag.None */);
                 }
             }
@@ -385,7 +406,7 @@ var Renderer;
             for (let i = 0, il = renderables.length; i < il; ++i) {
                 const r = renderables[i];
                 const alpha = (0, interpolate_1.clamp)(r.values.alpha.ref.value * r.state.alphaFactor, 0, 1);
-                if (alpha !== 0 && r.values.markerAverage.ref.value !== 1) {
+                if (alpha !== 0 && r.values.transparencyAverage.ref.value !== 1 && r.values.markerAverage.ref.value !== 1) {
                     renderObject(renderables[i], 'marking', 0 /* Flag.None */);
                 }
             }
@@ -410,6 +431,23 @@ var Renderer;
             if (debug_1.isTimingMode)
                 ctx.timer.markEnd('Renderer.renderMarkingMask');
         };
+        const renderEmissive = (group, camera, depthTexture) => {
+            if (debug_1.isTimingMode)
+                ctx.timer.mark('Renderer.renderEmissive');
+            state.disable(gl.BLEND);
+            state.enable(gl.DEPTH_TEST);
+            state.depthMask(true);
+            updateInternal(group, camera, depthTexture, 1 /* Mask.Opaque */, false);
+            const { renderables } = group;
+            for (let i = 0, il = renderables.length; i < il; ++i) {
+                const r = renderables[i];
+                if (checkOpaque(r)) {
+                    renderObject(r, 'emissive', 0 /* Flag.None */);
+                }
+            }
+            if (debug_1.isTimingMode)
+                ctx.timer.markEnd('Renderer.renderEmissive');
+        };
         const renderBlended = (scene, camera) => {
             if (scene.hasOpaque) {
                 renderBlendedOpaque(scene, camera, null);
@@ -419,7 +457,6 @@ var Renderer;
             }
         };
         const renderBlendedOpaque = (group, camera, depthTexture) => {
-            var _a, _b;
             if (debug_1.isTimingMode)
                 ctx.timer.mark('Renderer.renderBlendedOpaque');
             state.disable(gl.BLEND);
@@ -429,12 +466,9 @@ var Renderer;
             const { renderables } = group;
             for (let i = 0, il = renderables.length; i < il; ++i) {
                 const r = renderables[i];
-                if (r.state.opaque) {
+                if (checkOpaque(r)) {
                     renderObject(r, 'color', 0 /* Flag.None */);
                 }
-                else if (((_a = r.values.uDoubleSided) === null || _a === void 0 ? void 0 : _a.ref.value) && ((_b = r.values.dTransparentBackfaces) === null || _b === void 0 ? void 0 : _b.ref.value) === 'opaque') {
-                    renderObject(r, 'color', 2 /* Flag.BlendedBack */);
-                }
             }
             if (debug_1.isTimingMode)
                 ctx.timer.markEnd('Renderer.renderBlendedOpaque');
@@ -443,9 +477,6 @@ var Renderer;
             var _a, _b;
             if (debug_1.isTimingMode)
                 ctx.timer.mark('Renderer.renderBlendedTransparent');
-            state.enable(gl.DEPTH_TEST);
-            updateInternal(group, camera, depthTexture, 2 /* Mask.Transparent */, false);
-            const { renderables } = group;
             if (transparentBackground) {
                 state.blendFunc(gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
             }
@@ -453,17 +484,13 @@ var Renderer;
                 state.blendFuncSeparate(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA, gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
             }
             state.enable(gl.BLEND);
-            state.depthMask(true);
-            for (let i = 0, il = renderables.length; i < il; ++i) {
-                const r = renderables[i];
-                if (!r.state.opaque && r.state.writeDepth) {
-                    renderObject(r, 'color', 0 /* Flag.None */);
-                }
-            }
+            state.enable(gl.DEPTH_TEST);
             state.depthMask(false);
+            updateInternal(group, camera, depthTexture, 2 /* Mask.Transparent */, false);
+            const { renderables } = group;
             for (let i = 0, il = renderables.length; i < il; ++i) {
                 const r = renderables[i];
-                if ((!r.state.opaque && !r.state.writeDepth) || r.values.transparencyAverage.ref.value > 0) {
+                if (checkTransparent(r)) {
                     if ((_a = r.values.uDoubleSided) === null || _a === void 0 ? void 0 : _a.ref.value) {
                         // render frontfaces and backfaces separately to avoid artefacts
                         if (((_b = r.values.dTransparentBackfaces) === null || _b === void 0 ? void 0 : _b.ref.value) !== 'opaque') {
@@ -484,6 +511,7 @@ var Renderer;
                 ctx.timer.mark('Renderer.renderBlendedVolume');
             state.blendFunc(gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
             state.enable(gl.BLEND);
+            state.depthMask(false);
             updateInternal(group, camera, depthTexture, 2 /* Mask.Transparent */, false);
             const { renderables } = group;
             for (let i = 0, il = renderables.length; i < il; ++i) {
@@ -496,7 +524,6 @@ var Renderer;
                 ctx.timer.markEnd('Renderer.renderBlendedVolume');
         };
         const renderWboitOpaque = (group, camera, depthTexture) => {
-            var _a, _b, _c, _d;
             if (debug_1.isTimingMode)
                 ctx.timer.mark('Renderer.renderWboitOpaque');
             state.disable(gl.BLEND);
@@ -506,11 +533,7 @@ var Renderer;
             const { renderables } = group;
             for (let i = 0, il = renderables.length; i < il; ++i) {
                 const r = renderables[i];
-                // TODO: simplify, handle in renderable.state???
-                // uAlpha is updated in "render" so we need to recompute it here
-                const alpha = (0, interpolate_1.clamp)(r.values.alpha.ref.value * r.state.alphaFactor, 0, 1);
-                const xrayShaded = ((_a = r.values.dXrayShaded) === null || _a === void 0 ? void 0 : _a.ref.value) === 'on' || ((_b = r.values.dXrayShaded) === null || _b === void 0 ? void 0 : _b.ref.value) === 'inverted';
-                if ((alpha === 1 && r.values.transparencyAverage.ref.value !== 1 && r.values.dGeometryType.ref.value !== 'directVolume' && ((_c = r.values.dPointStyle) === null || _c === void 0 ? void 0 : _c.ref.value) !== 'fuzzy' && !xrayShaded) || ((_d = r.values.dTransparentBackfaces) === null || _d === void 0 ? void 0 : _d.ref.value) === 'opaque') {
+                if (checkOpaque(r)) {
                     renderObject(r, 'color', 0 /* Flag.None */);
                 }
             }
@@ -518,18 +541,13 @@ var Renderer;
                 ctx.timer.markEnd('Renderer.renderWboitOpaque');
         };
         const renderWboitTransparent = (group, camera, depthTexture) => {
-            var _a, _b, _c;
             if (debug_1.isTimingMode)
                 ctx.timer.mark('Renderer.renderWboitTransparent');
             updateInternal(group, camera, depthTexture, 2 /* Mask.Transparent */, false);
             const { renderables } = group;
             for (let i = 0, il = renderables.length; i < il; ++i) {
                 const r = renderables[i];
-                // TODO: simplify, handle in renderable.state???
-                // uAlpha is updated in "render" so we need to recompute it here
-                const alpha = (0, interpolate_1.clamp)(r.values.alpha.ref.value * r.state.alphaFactor, 0, 1);
-                const xrayShaded = ((_a = r.values.dXrayShaded) === null || _a === void 0 ? void 0 : _a.ref.value) === 'on' || ((_b = r.values.dXrayShaded) === null || _b === void 0 ? void 0 : _b.ref.value) === 'inverted';
-                if ((alpha < 1 && alpha !== 0) || r.values.transparencyAverage.ref.value > 0 || r.values.dGeometryType.ref.value === 'directVolume' || ((_c = r.values.dPointStyle) === null || _c === void 0 ? void 0 : _c.ref.value) === 'fuzzy' || r.values.dGeometryType.ref.value === 'text' || xrayShaded) {
+                if (checkTransparent(r)) {
                     renderObject(r, 'color', 0 /* Flag.None */);
                 }
             }
@@ -537,7 +555,6 @@ var Renderer;
                 ctx.timer.markEnd('Renderer.renderWboitTransparent');
         };
         const renderDpoitOpaque = (group, camera, depthTexture) => {
-            var _a, _b, _c, _d;
             if (debug_1.isTimingMode)
                 ctx.timer.mark('Renderer.renderDpoitOpaque');
             state.disable(gl.BLEND);
@@ -547,11 +564,7 @@ var Renderer;
             const { renderables } = group;
             for (let i = 0, il = renderables.length; i < il; ++i) {
                 const r = renderables[i];
-                // TODO: simplify, handle in renderable.state???
-                // uAlpha is updated in "render" so we need to recompute it here
-                const alpha = (0, interpolate_1.clamp)(r.values.alpha.ref.value * r.state.alphaFactor, 0, 1);
-                const xrayShaded = ((_a = r.values.dXrayShaded) === null || _a === void 0 ? void 0 : _a.ref.value) === 'on' || ((_b = r.values.dXrayShaded) === null || _b === void 0 ? void 0 : _b.ref.value) === 'inverted';
-                if ((alpha === 1 && r.values.transparencyAverage.ref.value !== 1 && ((_c = r.values.dPointStyle) === null || _c === void 0 ? void 0 : _c.ref.value) !== 'fuzzy' && !xrayShaded) || ((_d = r.values.dTransparentBackfaces) === null || _d === void 0 ? void 0 : _d.ref.value) === 'opaque') {
+                if (checkOpaque(r)) {
                     renderObject(r, 'color', 0 /* Flag.None */);
                 }
             }
@@ -559,7 +572,6 @@ var Renderer;
                 ctx.timer.markEnd('Renderer.renderDpoitOpaque');
         };
         const renderDpoitTransparent = (group, camera, depthTexture, dpoitTextures) => {
-            var _a, _b, _c;
             if (debug_1.isTimingMode)
                 ctx.timer.mark('Renderer.renderDpoitTransparent');
             state.enable(gl.BLEND);
@@ -570,11 +582,7 @@ var Renderer;
             const { renderables } = group;
             for (let i = 0, il = renderables.length; i < il; ++i) {
                 const r = renderables[i];
-                // TODO: simplify, handle in renderable.state???
-                // uAlpha is updated in "render" so we need to recompute it here
-                const alpha = (0, interpolate_1.clamp)(r.values.alpha.ref.value * r.state.alphaFactor, 0, 1);
-                const xrayShaded = ((_a = r.values.dXrayShaded) === null || _a === void 0 ? void 0 : _a.ref.value) === 'on' || ((_b = r.values.dXrayShaded) === null || _b === void 0 ? void 0 : _b.ref.value) === 'inverted';
-                if ((alpha < 1 && alpha !== 0) || r.values.transparencyAverage.ref.value > 0 || ((_c = r.values.dPointStyle) === null || _c === void 0 ? void 0 : _c.ref.value) === 'fuzzy' || r.values.dGeometryType.ref.value === 'text' || xrayShaded) {
+                if (checkTransparent(r)) {
                     renderObject(r, 'color', 0 /* Flag.None */);
                 }
             }
@@ -634,6 +642,7 @@ var Renderer;
             renderDepthTransparent,
             renderMarkingDepth,
             renderMarkingMask,
+            renderEmissive,
             renderBlended,
             renderBlendedOpaque,
             renderBlendedTransparent,

package/lib/commonjs/mol-gl/scene.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>
@@ -31,6 +31,8 @@ interface Scene extends Object3D {
     forEach: (callbackFn: (value: GraphicsRenderable, key: GraphicsRenderObject) => void) => void;
     /** Marker average of primitive renderables */
     readonly markerAverage: number;
+    /** Emissive average of primitive renderables */
+    readonly emissiveAverage: number;
     /** Opacity average of primitive renderables */
     readonly opacityAverage: number;
     /** Is `true` if any primitive renderable (possibly) has any opaque part */

package/lib/commonjs/mol-gl/scene.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>
  * @author David Sehnal <david.sehnal@gmail.com>
@@ -67,9 +67,11 @@ var Scene;
         let boundingSphereDirty = true;
         let boundingSphereVisibleDirty = true;
         let markerAverageDirty = true;
+        let emissiveAverageDirty = true;
         let opacityAverageDirty = true;
         let hasOpaqueDirty = true;
         let markerAverage = 0;
+        let emissiveAverage = 0;
         let opacityAverage = 0;
         let hasOpaque = false;
         const object3d = object3d_1.Object3D.create();
@@ -126,6 +128,7 @@ var Scene;
             }
             renderables.sort(renderableSort);
             markerAverageDirty = true;
+            emissiveAverageDirty = true;
             opacityAverageDirty = true;
             hasOpaqueDirty = true;
             return true;
@@ -149,6 +152,7 @@ var Scene;
             if (newVisibleHash !== visibleHash) {
                 boundingSphereVisibleDirty = true;
                 markerAverageDirty = true;
+                emissiveAverageDirty = true;
                 opacityAverageDirty = true;
                 hasOpaqueDirty = true;
                 visibleHash = newVisibleHash;
@@ -171,6 +175,19 @@ var Scene;
             }
             return count > 0 ? markerAverage / count : 0;
         }
+        function calculateEmissiveAverage() {
+            if (primitives.length === 0)
+                return 0;
+            let count = 0;
+            let emissiveAverage = 0;
+            for (let i = 0, il = primitives.length; i < il; ++i) {
+                if (!primitives[i].state.visible)
+                    continue;
+                emissiveAverage += primitives[i].values.emissiveAverage.ref.value + primitives[i].values.uEmissive.ref.value;
+                count += 1;
+            }
+            return count > 0 ? emissiveAverage / count : 0;
+        }
         function calculateOpacityAverage() {
             var _a, _b;
             if (primitives.length === 0)
@@ -242,6 +259,7 @@ var Scene;
                     syncVisibility();
                 }
                 markerAverageDirty = true;
+                emissiveAverageDirty = true;
                 opacityAverageDirty = true;
                 hasOpaqueDirty = true;
             },
@@ -291,6 +309,13 @@ var Scene;
                 }
                 return markerAverage;
             },
+            get emissiveAverage() {
+                if (emissiveAverageDirty) {
+                    emissiveAverage = calculateEmissiveAverage();
+                    emissiveAverageDirty = false;
+                }
+                return emissiveAverage;
+            },
             get opacityAverage() {
                 if (opacityAverageDirty) {
                     opacityAverage = calculateOpacityAverage();

package/lib/commonjs/mol-gl/shader/background.frag.d.ts

@@ -1 +1 @@
-export declare const background_frag = "\nprecision mediump float;\nprecision mediump samplerCube;\nprecision mediump sampler2D;\n\n#if defined(dVariant_skybox)\n    uniform samplerCube tSkybox;\n    uniform mat4 uViewDirectionProjectionInverse;\n    uniform float uBlur;\n    uniform float uOpacity;\n    uniform float uSaturation;\n    uniform float uLightness;\n#elif defined(dVariant_image)\n    uniform sampler2D tImage;\n    uniform vec2 uImageScale;\n    uniform vec2 uImageOffset;\n    uniform float uBlur;\n    uniform float uOpacity;\n    uniform float uSaturation;\n    uniform float uLightness;\n#elif defined(dVariant_horizontalGradient) || defined(dVariant_radialGradient)\n    uniform vec3 uGradientColorA;\n    uniform vec3 uGradientColorB;\n    uniform float uGradientRatio;\n#endif\n\nuniform vec2 uTexSize;\nuniform vec4 uViewport;\nuniform bool uViewportAdjusted;\nvarying vec4 vPosition;\n\n// TODO: add as general pp option to remove banding?\n// Iestyn's RGB dither from http://alex.vlachos.com/graphics/Alex_Vlachos_Advanced_VR_Rendering_GDC2015.pdf\nvec3 ScreenSpaceDither(vec2 vScreenPos) {\n    vec3 vDither = vec3(dot(vec2(171.0, 231.0), vScreenPos.xy));\n    vDither.rgb = fract(vDither.rgb / vec3(103.0, 71.0, 97.0));\n    return vDither.rgb / 255.0;\n}\n\nvec3 saturateColor(vec3 c, float amount) {\n    // https://www.w3.org/TR/WCAG21/#dfn-relative-luminance\n    const vec3 W = vec3(0.2125, 0.7154, 0.0721);\n    vec3 intensity = vec3(dot(c, W));\n    return mix(intensity, c, 1.0 + amount);\n}\n\nvec3 lightenColor(vec3 c, float amount) {\n    return c + amount;\n}\n\nvoid main() {\n    #if defined(dVariant_skybox)\n        vec4 t = uViewDirectionProjectionInverse * vPosition;\n        #ifdef enabledShaderTextureLod\n            gl_FragColor = textureCubeLodEXT(tSkybox, normalize(t.xyz / t.w), uBlur * 8.0);\n        #else\n            gl_FragColor = textureCube(tSkybox, normalize(t.xyz / t.w));\n        #endif\n        gl_FragColor.a = uOpacity;\n        gl_FragColor.rgb = lightenColor(saturateColor(gl_FragColor.rgb, uSaturation), uLightness);\n    #elif defined(dVariant_image)\n        vec2 coords;\n        if (uViewportAdjusted) {\n            coords = ((gl_FragCoord.xy - uViewport.xy) * (uTexSize / uViewport.zw) / uImageScale) + uImageOffset;\n        } else {\n            coords = (gl_FragCoord.xy / uImageScale) + uImageOffset;\n        }\n        #ifdef enabledShaderTextureLod\n            gl_FragColor = texture2DLodEXT(tImage, vec2(coords.x, 1.0 - coords.y), uBlur * 8.0);\n        #else\n            gl_FragColor = texture2D(tImage, vec2(coords.x, 1.0 - coords.y));\n        #endif\n        gl_FragColor.a = uOpacity;\n        gl_FragColor.rgb = lightenColor(saturateColor(gl_FragColor.rgb, uSaturation), uLightness);\n    #elif defined(dVariant_horizontalGradient)\n        float d;\n        if (uViewportAdjusted) {\n            d = ((gl_FragCoord.y - uViewport.y) * (uTexSize.y / uViewport.w) / uTexSize.y) + 1.0 - (uGradientRatio * 2.0);\n        } else {\n            d = (gl_FragCoord.y / uTexSize.y) + 1.0 - (uGradientRatio * 2.0);\n        }\n        gl_FragColor = vec4(mix(uGradientColorB, uGradientColorA, clamp(d, 0.0, 1.0)), 1.0);\n        gl_FragColor.rgb += ScreenSpaceDither(gl_FragCoord.xy);\n    #elif defined(dVariant_radialGradient)\n        float d;\n        if (uViewportAdjusted) {\n            d = distance(vec2(0.5), (gl_FragCoord.xy - uViewport.xy) * (uTexSize / uViewport.zw) / uTexSize) + uGradientRatio - 0.5;\n        } else {\n            d = distance(vec2(0.5), gl_FragCoord.xy / uTexSize) + uGradientRatio - 0.5;\n        }\n        gl_FragColor = vec4(mix(uGradientColorB, uGradientColorA, 1.0 - clamp(d, 0.0, 1.0)), 1.0);\n        gl_FragColor.rgb += ScreenSpaceDither(gl_FragCoord.xy);\n    #endif\n}\n";
+export declare const background_frag = "\nprecision mediump float;\nprecision mediump samplerCube;\nprecision mediump sampler2D;\n\n#if defined(dVariant_skybox)\n    uniform samplerCube tSkybox;\n    uniform mat4 uViewDirectionProjectionInverse;\n    uniform float uBlur;\n    uniform float uOpacity;\n    uniform float uSaturation;\n    uniform float uLightness;\n    uniform mat3 uRotation;\n#elif defined(dVariant_image)\n    uniform sampler2D tImage;\n    uniform vec2 uImageScale;\n    uniform vec2 uImageOffset;\n    uniform float uBlur;\n    uniform float uOpacity;\n    uniform float uSaturation;\n    uniform float uLightness;\n#elif defined(dVariant_horizontalGradient) || defined(dVariant_radialGradient)\n    uniform vec3 uGradientColorA;\n    uniform vec3 uGradientColorB;\n    uniform float uGradientRatio;\n#endif\n\nuniform vec2 uTexSize;\nuniform vec4 uViewport;\nuniform bool uViewportAdjusted;\nvarying vec4 vPosition;\n\n// TODO: add as general pp option to remove banding?\n// Iestyn's RGB dither from http://alex.vlachos.com/graphics/Alex_Vlachos_Advanced_VR_Rendering_GDC2015.pdf\nvec3 ScreenSpaceDither(vec2 vScreenPos) {\n    vec3 vDither = vec3(dot(vec2(171.0, 231.0), vScreenPos.xy));\n    vDither.rgb = fract(vDither.rgb / vec3(103.0, 71.0, 97.0));\n    return vDither.rgb / 255.0;\n}\n\nvec3 saturateColor(vec3 c, float amount) {\n    // https://www.w3.org/TR/WCAG21/#dfn-relative-luminance\n    const vec3 W = vec3(0.2125, 0.7154, 0.0721);\n    vec3 intensity = vec3(dot(c, W));\n    return mix(intensity, c, 1.0 + amount);\n}\n\nvec3 lightenColor(vec3 c, float amount) {\n    return c + amount;\n}\n\nvoid main() {\n    #if defined(dVariant_skybox)\n        vec4 t = uViewDirectionProjectionInverse * vPosition;\n        #ifdef enabledShaderTextureLod\n            gl_FragColor = textureCubeLodEXT(tSkybox, uRotation * normalize(t.xyz / t.w), uBlur * 8.0);\n        #else\n            gl_FragColor = textureCube(tSkybox, uRotation * normalize(t.xyz / t.w));\n        #endif\n        gl_FragColor.a = uOpacity;\n        gl_FragColor.rgb = lightenColor(saturateColor(gl_FragColor.rgb, uSaturation), uLightness);\n    #elif defined(dVariant_image)\n        vec2 coords;\n        if (uViewportAdjusted) {\n            coords = ((gl_FragCoord.xy - uViewport.xy) * (uTexSize / uViewport.zw) / uImageScale) + uImageOffset;\n        } else {\n            coords = (gl_FragCoord.xy / uImageScale) + uImageOffset;\n        }\n        #ifdef enabledShaderTextureLod\n            gl_FragColor = texture2DLodEXT(tImage, vec2(coords.x, 1.0 - coords.y), uBlur * 8.0);\n        #else\n            gl_FragColor = texture2D(tImage, vec2(coords.x, 1.0 - coords.y));\n        #endif\n        gl_FragColor.a = uOpacity;\n        gl_FragColor.rgb = lightenColor(saturateColor(gl_FragColor.rgb, uSaturation), uLightness);\n    #elif defined(dVariant_horizontalGradient)\n        float d;\n        if (uViewportAdjusted) {\n            d = ((gl_FragCoord.y - uViewport.y) * (uTexSize.y / uViewport.w) / uTexSize.y) + 1.0 - (uGradientRatio * 2.0);\n        } else {\n            d = (gl_FragCoord.y / uTexSize.y) + 1.0 - (uGradientRatio * 2.0);\n        }\n        gl_FragColor = vec4(mix(uGradientColorB, uGradientColorA, clamp(d, 0.0, 1.0)), 1.0);\n        gl_FragColor.rgb += ScreenSpaceDither(gl_FragCoord.xy);\n    #elif defined(dVariant_radialGradient)\n        float d;\n        if (uViewportAdjusted) {\n            d = distance(vec2(0.5), (gl_FragCoord.xy - uViewport.xy) * (uTexSize / uViewport.zw) / uTexSize) + uGradientRatio - 0.5;\n        } else {\n            d = distance(vec2(0.5), gl_FragCoord.xy / uTexSize) + uGradientRatio - 0.5;\n        }\n        gl_FragColor = vec4(mix(uGradientColorB, uGradientColorA, 1.0 - clamp(d, 0.0, 1.0)), 1.0);\n        gl_FragColor.rgb += ScreenSpaceDither(gl_FragCoord.xy);\n    #endif\n}\n";