molstar 4.3.0 → 4.4.0

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

@@ -19,6 +19,7 @@ export declare const CylindersSchema: {
     padding: ValueSpec<"number">;
     uDoubleSided: UniformSpec<"b">;
     dIgnoreLight: DefineSpec<"boolean">;
+    dCelShaded: DefineSpec<"boolean">;
     dXrayShaded: DefineSpec<"string">;
     dTransparentBackfaces: DefineSpec<"string">;
     dSolidInterior: DefineSpec<"boolean">;

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

@@ -5,7 +5,8 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CylindersRenderable = exports.CylindersSchema = void 0;
+exports.CylindersSchema = void 0;
+exports.CylindersRenderable = CylindersRenderable;
 const renderable_1 = require("../renderable");
 const render_item_1 = require("../webgl/render-item");
 const schema_1 = require("./schema");
@@ -25,6 +26,7 @@ exports.CylindersSchema = {
     padding: (0, schema_1.ValueSpec)('number'),
     uDoubleSided: (0, schema_1.UniformSpec)('b', 'material'),
     dIgnoreLight: (0, schema_1.DefineSpec)('boolean'),
+    dCelShaded: (0, schema_1.DefineSpec)('boolean'),
     dXrayShaded: (0, schema_1.DefineSpec)('string', ['off', 'on', 'inverted']),
     dTransparentBackfaces: (0, schema_1.DefineSpec)('string', ['off', 'on', 'opaque']),
     dSolidInterior: (0, schema_1.DefineSpec)('boolean'),
@@ -41,4 +43,3 @@ function CylindersRenderable(ctx, id, values, state, materialId, transparency) {
     const renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, { ...values, ...internalValues }, materialId, transparency);
     return (0, renderable_1.createRenderable)(renderItem, values, state);
 }
-exports.CylindersRenderable = CylindersRenderable;

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

@@ -30,6 +30,7 @@ export declare const DirectVolumeSchema: {
     dPackedGroup: DefineSpec<"boolean">;
     dAxisOrder: DefineSpec<"string">;
     dIgnoreLight: DefineSpec<"boolean">;
+    dCelShaded: DefineSpec<"boolean">;
     dXrayShaded: DefineSpec<"string">;
     dLightCount: DefineSpec<"number">;
     dColorMarker: DefineSpec<"boolean">;

package/lib/commonjs/mol-gl/renderable/direct-volume.js

@@ -5,7 +5,8 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DirectVolumeRenderable = exports.DirectVolumeSchema = void 0;
+exports.DirectVolumeSchema = void 0;
+exports.DirectVolumeRenderable = DirectVolumeRenderable;
 const renderable_1 = require("../renderable");
 const render_item_1 = require("../webgl/render-item");
 const schema_1 = require("./schema");
@@ -35,6 +36,7 @@ exports.DirectVolumeSchema = {
     dPackedGroup: (0, schema_1.DefineSpec)('boolean'),
     dAxisOrder: (0, schema_1.DefineSpec)('string', ['012', '021', '102', '120', '201', '210']),
     dIgnoreLight: (0, schema_1.DefineSpec)('boolean'),
+    dCelShaded: (0, schema_1.DefineSpec)('boolean'),
     dXrayShaded: (0, schema_1.DefineSpec)('string', ['off', 'on', 'inverted']),
 };
 function DirectVolumeRenderable(ctx, id, values, state, materialId, transparency) {
@@ -50,4 +52,3 @@ function DirectVolumeRenderable(ctx, id, values, state, materialId, transparency
     const renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, { ...values, ...internalValues }, materialId, transparency);
     return (0, renderable_1.createRenderable)(renderItem, values, state);
 }
-exports.DirectVolumeRenderable = DirectVolumeRenderable;

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

@@ -5,7 +5,8 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImageRenderable = exports.ImageSchema = void 0;
+exports.ImageSchema = void 0;
+exports.ImageRenderable = ImageRenderable;
 const renderable_1 = require("../renderable");
 const render_item_1 = require("../webgl/render-item");
 const schema_1 = require("./schema");
@@ -32,4 +33,3 @@ function ImageRenderable(ctx, id, values, state, materialId, transparency) {
     const renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, { ...values, ...internalValues }, materialId, transparency);
     return (0, renderable_1.createRenderable)(renderItem, values, state);
 }
-exports.ImageRenderable = ImageRenderable;

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

@@ -5,7 +5,8 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LinesRenderable = exports.LinesSchema = void 0;
+exports.LinesSchema = void 0;
+exports.LinesRenderable = LinesRenderable;
 const renderable_1 = require("../renderable");
 const render_item_1 = require("../webgl/render-item");
 const schema_1 = require("./schema");
@@ -32,4 +33,3 @@ function LinesRenderable(ctx, id, values, state, materialId, transparency) {
     const renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, { ...values, ...internalValues }, materialId, transparency);
     return (0, renderable_1.createRenderable)(renderItem, values, state);
 }
-exports.LinesRenderable = LinesRenderable;

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

@@ -17,6 +17,7 @@ export declare const MeshSchema: {
     readonly uDoubleSided: UniformSpec<"b">;
     readonly dFlipSided: DefineSpec<"boolean">;
     readonly dIgnoreLight: DefineSpec<"boolean">;
+    readonly dCelShaded: DefineSpec<"boolean">;
     readonly dXrayShaded: DefineSpec<"string">;
     readonly dTransparentBackfaces: DefineSpec<"string">;
     readonly uBumpFrequency: UniformSpec<"f">;

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

@@ -5,7 +5,8 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MeshRenderable = exports.MeshSchema = void 0;
+exports.MeshSchema = void 0;
+exports.MeshRenderable = MeshRenderable;
 const renderable_1 = require("../renderable");
 const render_item_1 = require("../webgl/render-item");
 const schema_1 = require("./schema");
@@ -22,6 +23,7 @@ exports.MeshSchema = {
     uDoubleSided: (0, schema_1.UniformSpec)('b', 'material'),
     dFlipSided: (0, schema_1.DefineSpec)('boolean'),
     dIgnoreLight: (0, schema_1.DefineSpec)('boolean'),
+    dCelShaded: (0, schema_1.DefineSpec)('boolean'),
     dXrayShaded: (0, schema_1.DefineSpec)('string', ['off', 'on', 'inverted']),
     dTransparentBackfaces: (0, schema_1.DefineSpec)('string', ['off', 'on', 'opaque']),
     uBumpFrequency: (0, schema_1.UniformSpec)('f', 'material'),
@@ -37,4 +39,3 @@ function MeshRenderable(ctx, id, values, state, materialId, transparency) {
     const renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, { ...values, ...internalValues }, materialId, transparency);
     return (0, renderable_1.createRenderable)(renderItem, values, state);
 }
-exports.MeshRenderable = MeshRenderable;

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

@@ -5,7 +5,8 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PointsRenderable = exports.PointsSchema = void 0;
+exports.PointsSchema = void 0;
+exports.PointsRenderable = PointsRenderable;
 const renderable_1 = require("../renderable");
 const render_item_1 = require("../webgl/render-item");
 const schema_1 = require("./schema");
@@ -28,4 +29,3 @@ function PointsRenderable(ctx, id, values, state, materialId, transparency) {
     const renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'points', shaderCode, schema, { ...values, ...internalValues }, materialId, transparency);
     return (0, renderable_1.createRenderable)(renderItem, values, state);
 }
-exports.PointsRenderable = PointsRenderable;

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

@@ -133,6 +133,7 @@ export declare const GlobalUniformSchema: {
     readonly uMarkerPriority: UniformSpec<"i">;
     readonly uMarkerAverage: UniformSpec<"f">;
     readonly uXrayEdgeFalloff: UniformSpec<"f">;
+    readonly uCelSteps: UniformSpec<"f">;
     readonly uExposure: UniformSpec<"f">;
     readonly uRenderMask: UniformSpec<"i">;
     readonly uMarkingDepthTest: UniformSpec<"b">;

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

@@ -6,7 +6,15 @@
  * @author Gianluca Tomasello <giagitom@gmail.com>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.BaseSchema = exports.ClippingSchema = exports.SubstanceSchema = exports.EmissiveSchema = exports.TransparencySchema = exports.OverpaintSchema = exports.MarkerSchema = exports.SizeSchema = exports.ColorSchema = exports.InternalSchema = exports.GlobalTextureSchema = exports.GlobalUniformSchema = void 0;
+exports.splitValues = splitValues;
+exports.getValueVersions = getValueVersions;
+exports.AttributeSpec = AttributeSpec;
+exports.UniformSpec = UniformSpec;
+exports.TextureSpec = TextureSpec;
+exports.ElementsSpec = ElementsSpec;
+exports.DefineSpec = DefineSpec;
+exports.ValueSpec = ValueSpec;
 function splitValues(schema, values) {
     const attributeValues = {};
     const defineValues = {};
@@ -40,7 +48,6 @@ function splitValues(schema, values) {
     });
     return { attributeValues, defineValues, textureValues, materialTextureValues, uniformValues, materialUniformValues, bufferedUniformValues };
 }
-exports.splitValues = splitValues;
 function getValueVersions(values) {
     const versions = {};
     Object.keys(values).forEach(k => {
@@ -48,31 +55,24 @@ function getValueVersions(values) {
     });
     return versions;
 }
-exports.getValueVersions = getValueVersions;
 function AttributeSpec(kind, itemSize, divisor) {
     return { type: 'attribute', kind, itemSize, divisor };
 }
-exports.AttributeSpec = AttributeSpec;
 function UniformSpec(kind, variant) {
     return { type: 'uniform', kind, variant };
 }
-exports.UniformSpec = UniformSpec;
 function TextureSpec(kind, format, dataType, filter, variant) {
     return { type: 'texture', kind, format, dataType, filter, variant };
 }
-exports.TextureSpec = TextureSpec;
 function ElementsSpec(kind) {
     return { type: 'elements', kind };
 }
-exports.ElementsSpec = ElementsSpec;
 function DefineSpec(kind, options) {
     return { type: 'define', kind, options };
 }
-exports.DefineSpec = DefineSpec;
 function ValueSpec(kind) {
     return { type: 'value', kind };
 }
-exports.ValueSpec = ValueSpec;
 //
 exports.GlobalUniformSchema = {
     uDrawId: UniformSpec('i'),
@@ -116,6 +116,7 @@ exports.GlobalUniformSchema = {
     uMarkerPriority: UniformSpec('i'),
     uMarkerAverage: UniformSpec('f'),
     uXrayEdgeFalloff: UniformSpec('f'),
+    uCelSteps: UniformSpec('f'),
     uExposure: UniformSpec('f'),
     uRenderMask: UniformSpec('i'),
     uMarkingDepthTest: UniformSpec('b'),

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

@@ -13,6 +13,7 @@ export declare const SpheresSchema: {
     padding: ValueSpec<"number">;
     uDoubleSided: UniformSpec<"b">;
     dIgnoreLight: DefineSpec<"boolean">;
+    dCelShaded: DefineSpec<"boolean">;
     dXrayShaded: DefineSpec<"string">;
     dTransparentBackfaces: DefineSpec<"string">;
     dSolidInterior: DefineSpec<"boolean">;

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

@@ -5,7 +5,8 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SpheresRenderable = exports.SpheresSchema = void 0;
+exports.SpheresSchema = void 0;
+exports.SpheresRenderable = SpheresRenderable;
 const renderable_1 = require("../renderable");
 const render_item_1 = require("../webgl/render-item");
 const schema_1 = require("./schema");
@@ -19,6 +20,7 @@ exports.SpheresSchema = {
     padding: (0, schema_1.ValueSpec)('number'),
     uDoubleSided: (0, schema_1.UniformSpec)('b', 'material'),
     dIgnoreLight: (0, schema_1.DefineSpec)('boolean'),
+    dCelShaded: (0, schema_1.DefineSpec)('boolean'),
     dXrayShaded: (0, schema_1.DefineSpec)('string', ['off', 'on', 'inverted']),
     dTransparentBackfaces: (0, schema_1.DefineSpec)('string', ['off', 'on', 'opaque']),
     dSolidInterior: (0, schema_1.DefineSpec)('boolean'),
@@ -40,4 +42,3 @@ function SpheresRenderable(ctx, id, values, state, materialId, transparency) {
     const renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, { ...values, ...internalValues }, materialId, transparency);
     return (0, renderable_1.createRenderable)(renderItem, values, state);
 }
-exports.SpheresRenderable = SpheresRenderable;

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

@@ -5,7 +5,8 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TextRenderable = exports.TextSchema = void 0;
+exports.TextSchema = void 0;
+exports.TextRenderable = TextRenderable;
 const renderable_1 = require("../renderable");
 const render_item_1 = require("../webgl/render-item");
 const schema_1 = require("./schema");
@@ -39,4 +40,3 @@ function TextRenderable(ctx, id, values, state, materialId, transparency) {
     const renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, { ...values, ...internalValues }, materialId, transparency);
     return (0, renderable_1.createRenderable)(renderItem, values, state);
 }
-exports.TextRenderable = TextRenderable;

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

@@ -17,6 +17,7 @@ export declare const TextureMeshSchema: {
     uDoubleSided: UniformSpec<"b">;
     dFlipSided: DefineSpec<"boolean">;
     dIgnoreLight: DefineSpec<"boolean">;
+    dCelShaded: DefineSpec<"boolean">;
     dXrayShaded: DefineSpec<"string">;
     dTransparentBackfaces: DefineSpec<"string">;
     uBumpFrequency: UniformSpec<"f">;

package/lib/commonjs/mol-gl/renderable/texture-mesh.js

@@ -5,7 +5,8 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TextureMeshRenderable = exports.TextureMeshSchema = void 0;
+exports.TextureMeshSchema = void 0;
+exports.TextureMeshRenderable = TextureMeshRenderable;
 const renderable_1 = require("../renderable");
 const render_item_1 = require("../webgl/render-item");
 const schema_1 = require("./schema");
@@ -22,6 +23,7 @@ exports.TextureMeshSchema = {
     uDoubleSided: (0, schema_1.UniformSpec)('b', 'material'),
     dFlipSided: (0, schema_1.DefineSpec)('boolean'),
     dIgnoreLight: (0, schema_1.DefineSpec)('boolean'),
+    dCelShaded: (0, schema_1.DefineSpec)('boolean'),
     dXrayShaded: (0, schema_1.DefineSpec)('string', ['off', 'on', 'inverted']),
     dTransparentBackfaces: (0, schema_1.DefineSpec)('string', ['off', 'on', 'opaque']),
     uBumpFrequency: (0, schema_1.UniformSpec)('f', 'material'),
@@ -37,4 +39,3 @@ function TextureMeshRenderable(ctx, id, values, state, materialId, transparency)
     const renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, { ...values, ...internalValues }, materialId, transparency);
     return (0, renderable_1.createRenderable)(renderItem, values, state);
 }
-exports.TextureMeshRenderable = TextureMeshRenderable;

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

@@ -5,7 +5,13 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateBoundingSphere = exports.calculateTransformBoundingSphere = exports.calculateInvariantBoundingSphere = exports.printImageData = exports.printTextureImage = exports.createTextureImage = exports.calculateTextureInfo = void 0;
+exports.calculateTextureInfo = calculateTextureInfo;
+exports.createTextureImage = createTextureImage;
+exports.printTextureImage = printTextureImage;
+exports.printImageData = printImageData;
+exports.calculateInvariantBoundingSphere = calculateInvariantBoundingSphere;
+exports.calculateTransformBoundingSphere = calculateTransformBoundingSphere;
+exports.calculateBoundingSphere = calculateBoundingSphere;
 const geometry_1 = require("../../mol-math/geometry");
 const linear_algebra_1 = require("../../mol-math/linear-algebra");
 const boundary_helper_1 = require("../../mol-math/geometry/boundary-helper");
@@ -21,13 +27,11 @@ function calculateTextureInfo(n, itemSize) {
     const height = width > 0 ? Math.ceil(n / width) : 0;
     return { width, height, length: width * height * itemSize };
 }
-exports.calculateTextureInfo = calculateTextureInfo;
 function createTextureImage(n, itemSize, arrayCtor, array) {
     const { length, width, height } = calculateTextureInfo(n, itemSize);
     array = array && array.length >= length ? array : new arrayCtor(length);
     return { array, width, height };
 }
-exports.createTextureImage = createTextureImage;
 const DefaultPrintImageOptions = {
     scale: 1,
     pixelated: false,
@@ -72,7 +76,6 @@ function printTextureImage(textureImage, options = {}) {
     }
     return printImageData(new ImageData(data, width, height), options);
 }
-exports.printTextureImage = printTextureImage;
 let tmpCanvas;
 let tmpCanvasCtx;
 let tmpContainer;
@@ -138,7 +141,6 @@ function printImageData(imageData, options = {}) {
         }, 'image/png');
     }
 }
-exports.printImageData = printImageData;
 //
 const v = (0, linear_algebra_1.Vec3)();
 const boundaryHelperCoarse = new boundary_helper_1.BoundaryHelper('14');
@@ -169,7 +171,6 @@ function calculateInvariantBoundingSphere(position, positionCount, stepFactor) {
     }
     return sphere;
 }
-exports.calculateInvariantBoundingSphere = calculateInvariantBoundingSphere;
 const _mat4 = (0, linear_algebra_1.Mat4)();
 function calculateTransformBoundingSphere(invariantBoundingSphere, transform, transformCount, transformOffset) {
     if (transformCount === 1) {
@@ -209,7 +210,6 @@ function calculateTransformBoundingSphere(invariantBoundingSphere, transform, tr
     }
     return boundaryHelper.getSphere();
 }
-exports.calculateTransformBoundingSphere = calculateTransformBoundingSphere;
 function calculateBoundingSphere(position, positionCount, transform, transformCount, padding = 0, stepFactor = 1) {
     const invariantBoundingSphere = calculateInvariantBoundingSphere(position, positionCount, stepFactor);
     const boundingSphere = calculateTransformBoundingSphere(invariantBoundingSphere, transform, transformCount, 0);
@@ -217,4 +217,3 @@ function calculateBoundingSphere(position, positionCount, transform, transformCo
     geometry_1.Sphere3D.expand(invariantBoundingSphere, invariantBoundingSphere, padding);
     return { boundingSphere, invariantBoundingSphere };
 }
-exports.calculateBoundingSphere = calculateBoundingSphere;

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

@@ -5,7 +5,8 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createComputeRenderable = exports.createRenderable = void 0;
+exports.createRenderable = createRenderable;
+exports.createComputeRenderable = createComputeRenderable;
 const mol_util_1 = require("../mol-util");
 const id_factory_1 = require("../mol-util/id-factory");
 const interpolate_1 = require("../mol-math/interpolate");
@@ -273,7 +274,6 @@ function createRenderable(renderItem, values, state) {
         dispose: () => renderItem.destroy()
     };
 }
-exports.createRenderable = createRenderable;
 function createComputeRenderable(renderItem, values) {
     return {
         id: getNextRenderableId(),
@@ -283,4 +283,3 @@ function createComputeRenderable(renderItem, values) {
         dispose: () => renderItem.destroy()
     };
 }
-exports.createComputeRenderable = createComputeRenderable;

package/lib/commonjs/mol-gl/renderer.d.ts

@@ -85,6 +85,7 @@ export declare const RendererParams: {
     dimStrength: PD.Numeric;
     markerPriority: PD.Select<number>;
     xrayEdgeFalloff: PD.Numeric;
+    celSteps: PD.Numeric;
     exposure: PD.Numeric;
     light: PD.ObjectList<PD.Normalize<{
         inclination: number;

package/lib/commonjs/mol-gl/renderer.js

@@ -46,6 +46,7 @@ exports.RendererParams = {
     dimStrength: param_definition_1.ParamDefinition.Numeric(0.0, { min: 0.0, max: 1.0, step: 0.1 }),
     markerPriority: param_definition_1.ParamDefinition.Select(1, [[1, 'Highlight'], [2, 'Select']]),
     xrayEdgeFalloff: param_definition_1.ParamDefinition.Numeric(1, { min: 0.0, max: 3.0, step: 0.1 }),
+    celSteps: param_definition_1.ParamDefinition.Numeric(5, { min: 2, max: 16, step: 1 }),
     exposure: param_definition_1.ParamDefinition.Numeric(1, { min: 0.0, max: 3.0, step: 0.01 }),
     light: param_definition_1.ParamDefinition.ObjectList({
         inclination: param_definition_1.ParamDefinition.Numeric(150, { min: 0, max: 180, step: 1 }),
@@ -155,6 +156,7 @@ var Renderer;
             uMarkerPriority: mol_util_1.ValueCell.create(p.markerPriority),
             uMarkerAverage: mol_util_1.ValueCell.create(0),
             uXrayEdgeFalloff: mol_util_1.ValueCell.create(p.xrayEdgeFalloff),
+            uCelSteps: mol_util_1.ValueCell.create(p.celSteps),
             uExposure: mol_util_1.ValueCell.create(p.exposure),
         };
         const globalUniformList = Object.entries(globalUniforms);
@@ -709,6 +711,10 @@ var Renderer;
                     p.xrayEdgeFalloff = props.xrayEdgeFalloff;
                     mol_util_1.ValueCell.update(globalUniforms.uXrayEdgeFalloff, p.xrayEdgeFalloff);
                 }
+                if (props.celSteps !== undefined && props.celSteps !== p.celSteps) {
+                    p.celSteps = props.celSteps;
+                    mol_util_1.ValueCell.update(globalUniforms.uCelSteps, p.celSteps);
+                }
                 if (props.exposure !== undefined && props.exposure !== p.exposure) {
                     p.exposure = props.exposure;
                     mol_util_1.ValueCell.update(globalUniforms.uExposure, p.exposure);

package/lib/commonjs/mol-gl/shader/background.frag.js

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

package/lib/commonjs/mol-gl/shader/background.vert.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.background_vert = void 0;
-exports.background_vert = `
-precision mediump float;
-
-attribute vec2 aPosition;
-
-varying vec4 vPosition;
-
-void main() {
-    vPosition = vec4(aPosition, 1.0, 1.0);
-    gl_Position = vec4(aPosition, 1.0, 1.0);
-}
+exports.background_vert = `
+precision mediump float;
+
+attribute vec2 aPosition;
+
+varying vec4 vPosition;
+
+void main() {
+    vPosition = vec4(aPosition, 1.0, 1.0);
+    gl_Position = vec4(aPosition, 1.0, 1.0);
+}
 `;