molstar 3.0.0-dev.3 → 3.0.0-dev.7

package/lib/commonjs/mol-canvas3d/passes/multi-sample.js

@@ -27,8 +27,8 @@ function getComposeRenderable(ctx, colorTexture) {
     return (0, renderable_1.createComputeRenderable)(renderItem, values);
 }
 exports.MultiSampleParams = {
-    mode: param_definition_1.ParamDefinition.Select('off', [['off', 'Off'], ['on', 'On'], ['temporal', 'Temporal']]),
-    sampleLevel: param_definition_1.ParamDefinition.Numeric(2, { min: 0, max: 5, step: 1 }),
+    mode: param_definition_1.ParamDefinition.Select('temporal', [['off', 'Off'], ['on', 'On'], ['temporal', 'Temporal']]),
+    sampleLevel: param_definition_1.ParamDefinition.Numeric(2, { min: 0, max: 5, step: 1 }, { description: 'Take level^2 samples.' }),
 };
 var MultiSamplePass = /** @class */ (function () {
     function MultiSamplePass(webgl, drawPass) {
@@ -266,8 +266,10 @@ var MultiSampleHelper = /** @class */ (function () {
             this.sampleIndex = -1;
         return props.mode === 'temporal' ? this.sampleIndex !== -2 : false;
     };
+    /** Return `true` while more samples are needed */
     MultiSampleHelper.prototype.render = function (renderer, camera, scene, helper, toDrawingBuffer, transparentBackground, props) {
         this.sampleIndex = this.multiSamplePass.render(this.sampleIndex, renderer, camera, scene, helper, toDrawingBuffer, transparentBackground, props);
+        return this.sampleIndex < 0;
     };
     return MultiSampleHelper;
 }());

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

@@ -46,29 +46,29 @@ var PickPass = /** @class */ (function () {
             this.depthPickTarget.setSize(this.pickWidth, this.pickHeight);
         }
     };
-    PickPass.prototype.renderVariant = function (renderer, camera, scene, helper, variant) {
+    PickPass.prototype.renderVariant = function (renderer, camera, scene, helper, variant, pickType) {
         var depth = this.drawPass.depthTexturePrimitives;
         renderer.clear(false);
         renderer.update(camera);
-        renderer.renderPick(scene.primitives, camera, variant, null);
-        renderer.renderPick(scene.volumes, camera, variant, depth);
-        renderer.renderPick(helper.handle.scene, camera, variant, null);
+        renderer.renderPick(scene.primitives, camera, variant, null, pickType);
+        renderer.renderPick(scene.volumes, camera, variant, depth, pickType);
+        renderer.renderPick(helper.handle.scene, camera, variant, null, pickType);
         if (helper.camera.isEnabled) {
             helper.camera.update(camera);
             renderer.update(helper.camera.camera);
-            renderer.renderPick(helper.camera.scene, helper.camera.camera, variant, null);
+            renderer.renderPick(helper.camera.scene, helper.camera.camera, variant, null, pickType);
         }
     };
     PickPass.prototype.render = function (renderer, camera, scene, helper) {
         this.objectPickTarget.bind();
-        this.renderVariant(renderer, camera, scene, helper, 'pickObject');
+        this.renderVariant(renderer, camera, scene, helper, 'pick', 1 /* Object */);
         this.instancePickTarget.bind();
-        this.renderVariant(renderer, camera, scene, helper, 'pickInstance');
+        this.renderVariant(renderer, camera, scene, helper, 'pick', 2 /* Instance */);
         this.groupPickTarget.bind();
-        this.renderVariant(renderer, camera, scene, helper, 'pickGroup');
+        this.renderVariant(renderer, camera, scene, helper, 'pick', 3 /* Group */);
         // printTexture(this.webgl, this.groupPickTarget.texture, { id: 'group' })
         this.depthPickTarget.bind();
-        this.renderVariant(renderer, camera, scene, helper, 'depth');
+        this.renderVariant(renderer, camera, scene, helper, 'depth', 0 /* None */);
     };
     return PickPass;
 }());

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

@@ -20,6 +20,7 @@ export declare const PostprocessingParams: {
     outline: PD.Mapped<PD.NamedParams<PD.Normalize<unknown>, "off"> | PD.NamedParams<PD.Normalize<{
         scale: number;
         threshold: number;
+        color: Color;
     }>, "on">>;
     antialiasing: PD.Mapped<PD.NamedParams<PD.Normalize<unknown>, "off"> | PD.NamedParams<PD.Normalize<{
         edgeThreshold: number;

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

@@ -34,7 +34,7 @@ function getOutlinesRenderable(ctx, depthTexture) {
 }
 var SsaoSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, util_1.QuadSchema), { tDepth: (0, schema_1.TextureSpec)('texture', 'rgba', 'ubyte', 'nearest'), uSamples: (0, schema_1.UniformSpec)('v3[]'), dNSamples: (0, schema_1.DefineSpec)('number'), uProjection: (0, schema_1.UniformSpec)('m4'), uInvProjection: (0, schema_1.UniformSpec)('m4'), uBounds: (0, schema_1.UniformSpec)('v4'), uTexSize: (0, schema_1.UniformSpec)('v2'), uRadius: (0, schema_1.UniformSpec)('f'), uBias: (0, schema_1.UniformSpec)('f') });
 function getSsaoRenderable(ctx, depthTexture) {
-    var values = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, util_1.QuadValues), { tDepth: mol_util_1.ValueCell.create(depthTexture), uSamples: mol_util_1.ValueCell.create([0.0, 0.0, 1.0]), dNSamples: mol_util_1.ValueCell.create(1), uProjection: mol_util_1.ValueCell.create(linear_algebra_1.Mat4.identity()), uInvProjection: mol_util_1.ValueCell.create(linear_algebra_1.Mat4.identity()), uBounds: mol_util_1.ValueCell.create((0, linear_algebra_1.Vec4)()), uTexSize: mol_util_1.ValueCell.create(linear_algebra_1.Vec2.create(ctx.gl.drawingBufferWidth, ctx.gl.drawingBufferHeight)), uRadius: mol_util_1.ValueCell.create(8.0), uBias: mol_util_1.ValueCell.create(0.025) });
+    var values = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, util_1.QuadValues), { tDepth: mol_util_1.ValueCell.create(depthTexture), uSamples: mol_util_1.ValueCell.create([0.0, 0.0, 1.0]), dNSamples: mol_util_1.ValueCell.create(32), uProjection: mol_util_1.ValueCell.create(linear_algebra_1.Mat4.identity()), uInvProjection: mol_util_1.ValueCell.create(linear_algebra_1.Mat4.identity()), uBounds: mol_util_1.ValueCell.create((0, linear_algebra_1.Vec4)()), uTexSize: mol_util_1.ValueCell.create(linear_algebra_1.Vec2.create(ctx.gl.drawingBufferWidth, ctx.gl.drawingBufferHeight)), uRadius: mol_util_1.ValueCell.create(8.0), uBias: mol_util_1.ValueCell.create(0.025) });
     var schema = (0, tslib_1.__assign)({}, SsaoSchema);
     var shaderCode = (0, shader_code_1.ShaderCode)('ssao', quad_vert_1.quad_vert, ssao_frag_1.ssao_frag);
     var renderItem = (0, render_item_1.createComputeRenderItem)(ctx, 'triangles', shaderCode, schema, values);
@@ -42,7 +42,7 @@ function getSsaoRenderable(ctx, depthTexture) {
 }
 var SsaoBlurSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, util_1.QuadSchema), { tSsaoDepth: (0, schema_1.TextureSpec)('texture', 'rgba', 'ubyte', 'nearest'), uTexSize: (0, schema_1.UniformSpec)('v2'), uKernel: (0, schema_1.UniformSpec)('f[]'), dOcclusionKernelSize: (0, schema_1.DefineSpec)('number'), uBlurDirectionX: (0, schema_1.UniformSpec)('f'), uBlurDirectionY: (0, schema_1.UniformSpec)('f'), uMaxPossibleViewZDiff: (0, schema_1.UniformSpec)('f'), uNear: (0, schema_1.UniformSpec)('f'), uFar: (0, schema_1.UniformSpec)('f'), uBounds: (0, schema_1.UniformSpec)('v4'), dOrthographic: (0, schema_1.DefineSpec)('number') });
 function getSsaoBlurRenderable(ctx, ssaoDepthTexture, direction) {
-    var values = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, util_1.QuadValues), { tSsaoDepth: mol_util_1.ValueCell.create(ssaoDepthTexture), uTexSize: mol_util_1.ValueCell.create(linear_algebra_1.Vec2.create(ssaoDepthTexture.getWidth(), ssaoDepthTexture.getHeight())), uKernel: mol_util_1.ValueCell.create([0.0]), dOcclusionKernelSize: mol_util_1.ValueCell.create(1), uBlurDirectionX: mol_util_1.ValueCell.create(direction === 'horizontal' ? 1 : 0), uBlurDirectionY: mol_util_1.ValueCell.create(direction === 'vertical' ? 1 : 0), uMaxPossibleViewZDiff: mol_util_1.ValueCell.create(0.5), uNear: mol_util_1.ValueCell.create(0.0), uFar: mol_util_1.ValueCell.create(10000.0), uBounds: mol_util_1.ValueCell.create((0, linear_algebra_1.Vec4)()), dOrthographic: mol_util_1.ValueCell.create(0) });
+    var values = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, util_1.QuadValues), { tSsaoDepth: mol_util_1.ValueCell.create(ssaoDepthTexture), uTexSize: mol_util_1.ValueCell.create(linear_algebra_1.Vec2.create(ssaoDepthTexture.getWidth(), ssaoDepthTexture.getHeight())), uKernel: mol_util_1.ValueCell.create([0.0]), dOcclusionKernelSize: mol_util_1.ValueCell.create(15), uBlurDirectionX: mol_util_1.ValueCell.create(direction === 'horizontal' ? 1 : 0), uBlurDirectionY: mol_util_1.ValueCell.create(direction === 'vertical' ? 1 : 0), uMaxPossibleViewZDiff: mol_util_1.ValueCell.create(0.5), uNear: mol_util_1.ValueCell.create(0.0), uFar: mol_util_1.ValueCell.create(10000.0), uBounds: mol_util_1.ValueCell.create((0, linear_algebra_1.Vec4)()), dOrthographic: mol_util_1.ValueCell.create(0) });
     var schema = (0, tslib_1.__assign)({}, SsaoBlurSchema);
     var shaderCode = (0, shader_code_1.ShaderCode)('ssao_blur', quad_vert_1.quad_vert, ssao_blur_frag_1.ssaoBlur_frag);
     var renderItem = (0, render_item_1.createComputeRenderItem)(ctx, 'triangles', shaderCode, schema, values);
@@ -68,9 +68,9 @@ function getSamples(vectorSamples, nSamples) {
     }
     return samples;
 }
-var PostprocessingSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, util_1.QuadSchema), { tSsaoDepth: (0, schema_1.TextureSpec)('texture', 'rgba', 'ubyte', 'nearest'), tColor: (0, schema_1.TextureSpec)('texture', 'rgba', 'ubyte', 'nearest'), tDepth: (0, schema_1.TextureSpec)('texture', 'rgba', 'ubyte', 'nearest'), tOutlines: (0, schema_1.TextureSpec)('texture', 'rgba', 'ubyte', 'nearest'), uTexSize: (0, schema_1.UniformSpec)('v2'), dOrthographic: (0, schema_1.DefineSpec)('number'), uNear: (0, schema_1.UniformSpec)('f'), uFar: (0, schema_1.UniformSpec)('f'), uFogNear: (0, schema_1.UniformSpec)('f'), uFogFar: (0, schema_1.UniformSpec)('f'), uFogColor: (0, schema_1.UniformSpec)('v3'), uTransparentBackground: (0, schema_1.UniformSpec)('b'), uMaxPossibleViewZDiff: (0, schema_1.UniformSpec)('f'), dOcclusionEnable: (0, schema_1.DefineSpec)('boolean'), dOutlineEnable: (0, schema_1.DefineSpec)('boolean'), dOutlineScale: (0, schema_1.DefineSpec)('number'), uOutlineThreshold: (0, schema_1.UniformSpec)('f') });
+var PostprocessingSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, util_1.QuadSchema), { tSsaoDepth: (0, schema_1.TextureSpec)('texture', 'rgba', 'ubyte', 'nearest'), tColor: (0, schema_1.TextureSpec)('texture', 'rgba', 'ubyte', 'nearest'), tDepth: (0, schema_1.TextureSpec)('texture', 'rgba', 'ubyte', 'nearest'), tOutlines: (0, schema_1.TextureSpec)('texture', 'rgba', 'ubyte', 'nearest'), uTexSize: (0, schema_1.UniformSpec)('v2'), dOrthographic: (0, schema_1.DefineSpec)('number'), uNear: (0, schema_1.UniformSpec)('f'), uFar: (0, schema_1.UniformSpec)('f'), uFogNear: (0, schema_1.UniformSpec)('f'), uFogFar: (0, schema_1.UniformSpec)('f'), uFogColor: (0, schema_1.UniformSpec)('v3'), uOutlineColor: (0, schema_1.UniformSpec)('v3'), uTransparentBackground: (0, schema_1.UniformSpec)('b'), uMaxPossibleViewZDiff: (0, schema_1.UniformSpec)('f'), dOcclusionEnable: (0, schema_1.DefineSpec)('boolean'), dOutlineEnable: (0, schema_1.DefineSpec)('boolean'), dOutlineScale: (0, schema_1.DefineSpec)('number'), uOutlineThreshold: (0, schema_1.UniformSpec)('f') });
 function getPostprocessingRenderable(ctx, colorTexture, depthTexture, outlinesTexture, ssaoDepthTexture) {
-    var values = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, util_1.QuadValues), { tSsaoDepth: mol_util_1.ValueCell.create(ssaoDepthTexture), tColor: mol_util_1.ValueCell.create(colorTexture), tDepth: mol_util_1.ValueCell.create(depthTexture), tOutlines: mol_util_1.ValueCell.create(outlinesTexture), uTexSize: mol_util_1.ValueCell.create(linear_algebra_1.Vec2.create(colorTexture.getWidth(), colorTexture.getHeight())), dOrthographic: mol_util_1.ValueCell.create(0), uNear: mol_util_1.ValueCell.create(1), uFar: mol_util_1.ValueCell.create(10000), uFogNear: mol_util_1.ValueCell.create(10000), uFogFar: mol_util_1.ValueCell.create(10000), uFogColor: mol_util_1.ValueCell.create(linear_algebra_1.Vec3.create(1, 1, 1)), uTransparentBackground: mol_util_1.ValueCell.create(false), uMaxPossibleViewZDiff: mol_util_1.ValueCell.create(0.5), dOcclusionEnable: mol_util_1.ValueCell.create(false), dOutlineEnable: mol_util_1.ValueCell.create(false), dOutlineScale: mol_util_1.ValueCell.create(1), uOutlineThreshold: mol_util_1.ValueCell.create(0.33) });
+    var values = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, util_1.QuadValues), { tSsaoDepth: mol_util_1.ValueCell.create(ssaoDepthTexture), tColor: mol_util_1.ValueCell.create(colorTexture), tDepth: mol_util_1.ValueCell.create(depthTexture), tOutlines: mol_util_1.ValueCell.create(outlinesTexture), uTexSize: mol_util_1.ValueCell.create(linear_algebra_1.Vec2.create(colorTexture.getWidth(), colorTexture.getHeight())), dOrthographic: mol_util_1.ValueCell.create(0), uNear: mol_util_1.ValueCell.create(1), uFar: mol_util_1.ValueCell.create(10000), uFogNear: mol_util_1.ValueCell.create(10000), uFogFar: mol_util_1.ValueCell.create(10000), uFogColor: mol_util_1.ValueCell.create(linear_algebra_1.Vec3.create(1, 1, 1)), uOutlineColor: mol_util_1.ValueCell.create(linear_algebra_1.Vec3.create(0, 0, 0)), uTransparentBackground: mol_util_1.ValueCell.create(false), uMaxPossibleViewZDiff: mol_util_1.ValueCell.create(0.5), dOcclusionEnable: mol_util_1.ValueCell.create(true), dOutlineEnable: mol_util_1.ValueCell.create(false), dOutlineScale: mol_util_1.ValueCell.create(1), uOutlineThreshold: mol_util_1.ValueCell.create(0.33) });
     var schema = (0, tslib_1.__assign)({}, PostprocessingSchema);
     var shaderCode = (0, shader_code_1.ShaderCode)('postprocessing', quad_vert_1.quad_vert, postprocessing_frag_1.postprocessing_frag);
     var renderItem = (0, render_item_1.createComputeRenderItem)(ctx, 'triangles', shaderCode, schema, values);
@@ -90,6 +90,7 @@ exports.PostprocessingParams = {
         on: param_definition_1.ParamDefinition.Group({
             scale: param_definition_1.ParamDefinition.Numeric(1, { min: 1, max: 5, step: 1 }),
             threshold: param_definition_1.ParamDefinition.Numeric(0.33, { min: 0.01, max: 1, step: 0.01 }),
+            color: param_definition_1.ParamDefinition.Color((0, color_1.Color)(0x000000)),
         }),
         off: param_definition_1.ParamDefinition.Group({})
     }, { cycle: true, description: 'Draw outline around 3D objects' }),
@@ -223,6 +224,7 @@ var PostprocessingPass = /** @class */ (function () {
             mol_util_1.ValueCell.updateIfChanged(this.outlinesRenderable.values.uNear, camera.near);
             mol_util_1.ValueCell.updateIfChanged(this.outlinesRenderable.values.uFar, camera.far);
             mol_util_1.ValueCell.updateIfChanged(this.outlinesRenderable.values.uMaxPossibleViewZDiff, maxPossibleViewZDiff);
+            mol_util_1.ValueCell.update(this.renderable.values.uOutlineColor, color_1.Color.toVec3Normalized(this.renderable.values.uOutlineColor.ref.value, props.outline.params.color));
             mol_util_1.ValueCell.updateIfChanged(this.renderable.values.uMaxPossibleViewZDiff, maxPossibleViewZDiff);
             if (this.renderable.values.dOutlineScale.ref.value !== outlineScale) {
                 needsUpdateMain = true;

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

@@ -138,7 +138,7 @@ function getWeightsRenderable(ctx, edgesTexture) {
     var height = edgesTexture.getHeight();
     var areaTexture = (0, texture_1.createTexture)(ctx.gl, ctx.extensions, 'image-uint8', 'rgb', 'ubyte', 'linear');
     var searchTexture = (0, texture_1.createTexture)(ctx.gl, ctx.extensions, 'image-uint8', 'rgba', 'ubyte', 'nearest');
-    var values = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, util_1.QuadValues), { tEdges: mol_util_1.ValueCell.create(edgesTexture), tArea: mol_util_1.ValueCell.create(areaTexture), tSearch: mol_util_1.ValueCell.create(searchTexture), uTexSizeInv: mol_util_1.ValueCell.create(linear_algebra_1.Vec2.create(1 / width, 1 / height)), uViewport: mol_util_1.ValueCell.create((0, linear_algebra_1.Vec4)()), dMaxSearchSteps: mol_util_1.ValueCell.create(8) });
+    var values = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, util_1.QuadValues), { tEdges: mol_util_1.ValueCell.create(edgesTexture), tArea: mol_util_1.ValueCell.create(areaTexture), tSearch: mol_util_1.ValueCell.create(searchTexture), uTexSizeInv: mol_util_1.ValueCell.create(linear_algebra_1.Vec2.create(1 / width, 1 / height)), uViewport: mol_util_1.ValueCell.create((0, linear_algebra_1.Vec4)()), dMaxSearchSteps: mol_util_1.ValueCell.create(16) });
     // Note: loading image textures requires `HTMLImageElement` to be available
     (0, texture_1.loadImageTexture)(getAreaTexture(), values.tArea, areaTexture);
     (0, texture_1.loadImageTexture)(getSearchTexture(), values.tSearch, searchTexture);

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

@@ -10,6 +10,7 @@ import { LocationIterator } from '../util/location-iterator';
 import { ParamDefinition as PD } from '../../mol-util/param-definition';
 import { TransformData } from './transform-data';
 import { Theme } from '../../mol-theme/theme';
+import { Clip } from '../../mol-util/clip';
 export declare const VisualQualityInfo: {
     custom: {};
     auto: {};
@@ -46,6 +47,17 @@ export declare namespace BaseGeometry {
         material: PD.Group<PD.Normalize<{
             metalness: number;
             roughness: number;
+            bumpiness: number;
+        }>>;
+        clip: PD.Group<PD.Normalize<{
+            variant: Clip.Variant;
+            objects: PD.Normalize<{
+                type: any;
+                invert: any;
+                position: any;
+                rotation: any;
+                scale: any;
+            }>[];
         }>>;
     };
     type Params = typeof Params;
@@ -68,7 +80,15 @@ export declare namespace BaseGeometry {
         drawCount: ValueCell<number, never>;
         uMetalness: ValueCell<number, never>;
         uRoughness: ValueCell<number, never>;
+        uBumpiness: ValueCell<number, never>;
         dLightCount: ValueCell<number, never>;
+        dClipObjectCount: ValueCell<number, never>;
+        dClipVariant: ValueCell<Clip.Variant, never>;
+        uClipObjectType: ValueCell<number[], never>;
+        uClipObjectInvert: ValueCell<boolean[], never>;
+        uClipObjectPosition: ValueCell<number[], never>;
+        uClipObjectRotation: ValueCell<number[], never>;
+        uClipObjectScale: ValueCell<number[], never>;
     };
     function updateValues(values: BaseValues, props: PD.Values<Params>): void;
     function createRenderableState(props?: Partial<PD.Values<Params>>): RenderableState;

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

@@ -16,6 +16,7 @@ var uniform_1 = require("../../mol-theme/color/uniform");
 var uniform_2 = require("../../mol-theme/size/uniform");
 var interpolate_1 = require("../../mol-math/interpolate");
 var material_1 = require("../../mol-util/material");
+var clip_1 = require("../../mol-util/clip");
 exports.VisualQualityInfo = {
     'custom': {},
     'auto': {},
@@ -76,6 +77,7 @@ var BaseGeometry;
         alpha: param_definition_1.ParamDefinition.Numeric(1, { min: 0, max: 1, step: 0.01 }, { label: 'Opacity', isEssential: true, description: 'How opaque/transparent the representation is rendered.' }),
         quality: param_definition_1.ParamDefinition.Select('auto', exports.VisualQualityOptions, { isEssential: true, description: 'Visual/rendering quality of the representation.' }),
         material: material_1.Material.getParam(),
+        clip: param_definition_1.ParamDefinition.Group(clip_1.Clip.Params),
     };
     function createSimple(colorValue, sizeValue, transform) {
         if (colorValue === void 0) { colorValue = names_1.ColorNames.grey; }
@@ -91,6 +93,7 @@ var BaseGeometry;
     }
     BaseGeometry.createSimple = createSimple;
     function createValues(props, counts) {
+        var clip = clip_1.Clip.getClip(props.clip);
         return {
             alpha: mol_util_1.ValueCell.create(props.alpha),
             uAlpha: mol_util_1.ValueCell.create(props.alpha),
@@ -99,7 +102,15 @@ var BaseGeometry;
             drawCount: mol_util_1.ValueCell.create(counts.drawCount),
             uMetalness: mol_util_1.ValueCell.create(props.material.metalness),
             uRoughness: mol_util_1.ValueCell.create(props.material.roughness),
+            uBumpiness: mol_util_1.ValueCell.create(props.material.bumpiness),
             dLightCount: mol_util_1.ValueCell.create(1),
+            dClipObjectCount: mol_util_1.ValueCell.create(clip.objects.count),
+            dClipVariant: mol_util_1.ValueCell.create(clip.variant),
+            uClipObjectType: mol_util_1.ValueCell.create(clip.objects.type),
+            uClipObjectInvert: mol_util_1.ValueCell.create(clip.objects.invert),
+            uClipObjectPosition: mol_util_1.ValueCell.create(clip.objects.position),
+            uClipObjectRotation: mol_util_1.ValueCell.create(clip.objects.rotation),
+            uClipObjectScale: mol_util_1.ValueCell.create(clip.objects.scale),
         };
     }
     BaseGeometry.createValues = createValues;
@@ -107,6 +118,15 @@ var BaseGeometry;
         mol_util_1.ValueCell.updateIfChanged(values.alpha, props.alpha); // `uAlpha` is set in renderable.render
         mol_util_1.ValueCell.updateIfChanged(values.uMetalness, props.material.metalness);
         mol_util_1.ValueCell.updateIfChanged(values.uRoughness, props.material.roughness);
+        mol_util_1.ValueCell.updateIfChanged(values.uBumpiness, props.material.bumpiness);
+        var clip = clip_1.Clip.getClip(props.clip);
+        mol_util_1.ValueCell.update(values.dClipObjectCount, clip.objects.count);
+        mol_util_1.ValueCell.update(values.dClipVariant, clip.variant);
+        mol_util_1.ValueCell.update(values.uClipObjectType, clip.objects.type);
+        mol_util_1.ValueCell.update(values.uClipObjectInvert, clip.objects.invert);
+        mol_util_1.ValueCell.update(values.uClipObjectPosition, clip.objects.position);
+        mol_util_1.ValueCell.update(values.uClipObjectRotation, clip.objects.rotation);
+        mol_util_1.ValueCell.update(values.uClipObjectScale, clip.objects.scale);
     }
     BaseGeometry.updateValues = updateValues;
     function createRenderableState(props) {
@@ -120,7 +140,6 @@ var BaseGeometry;
             colorOnly: false,
             opaque: opaque,
             writeDepth: opaque,
-            noClip: false,
         };
     }
     BaseGeometry.createRenderableState = createRenderableState;

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -8,8 +8,6 @@ import { Vec2 } from '../../mol-math/linear-algebra';
 import { TextureImage } from '../../mol-gl/renderable/util';
 import { Clipping } from '../../mol-theme/clipping';
 export declare type ClippingData = {
-    dClipObjectCount: ValueCell<number>;
-    dClipVariant: ValueCell<string>;
     tClipping: ValueCell<TextureImage<Uint8Array>>;
     uClippingTexDim: ValueCell<Vec2>;
     dClipping: ValueCell<boolean>;

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

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -10,9 +10,7 @@ var value_cell_1 = require("../../mol-util/value-cell");
 var linear_algebra_1 = require("../../mol-math/linear-algebra");
 var util_1 = require("../../mol-gl/renderable/util");
 function applyClippingGroups(array, start, end, groups) {
-    for (var i = start; i < end; ++i) {
-        array[i] = groups;
-    }
+    array.fill(groups, start, end);
     return true;
 }
 exports.applyClippingGroups = applyClippingGroups;
@@ -30,8 +28,6 @@ function createClipping(count, clippingData) {
     }
     else {
         return {
-            dClipObjectCount: value_cell_1.ValueCell.create(0),
-            dClipVariant: value_cell_1.ValueCell.create('instance'),
             tClipping: value_cell_1.ValueCell.create(clipping),
             uClippingTexDim: value_cell_1.ValueCell.create(linear_algebra_1.Vec2.create(clipping.width, clipping.height)),
             dClipping: value_cell_1.ValueCell.create(count > 0),
@@ -44,12 +40,11 @@ function createEmptyClipping(clippingData) {
     if (clippingData) {
         value_cell_1.ValueCell.update(clippingData.tClipping, emptyClippingTexture);
         value_cell_1.ValueCell.update(clippingData.uClippingTexDim, linear_algebra_1.Vec2.create(1, 1));
+        value_cell_1.ValueCell.updateIfChanged(clippingData.dClipping, false);
         return clippingData;
     }
     else {
         return {
-            dClipObjectCount: value_cell_1.ValueCell.create(0),
-            dClipVariant: value_cell_1.ValueCell.create('instance'),
             tClipping: value_cell_1.ValueCell.create(emptyClippingTexture),
             uClippingTexDim: value_cell_1.ValueCell.create(linear_algebra_1.Vec2.create(1, 1)),
             dClipping: value_cell_1.ValueCell.create(false),

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

@@ -43,11 +43,24 @@ export declare namespace Cylinders {
         doubleSided: PD.BooleanParam;
         ignoreLight: PD.BooleanParam;
         xrayShaded: PD.BooleanParam;
+        bumpFrequency: PD.Numeric;
+        bumpAmplitude: PD.Numeric;
         alpha: PD.Numeric;
         quality: PD.Select<"auto" | "medium" | "high" | "low" | "custom" | "highest" | "higher" | "lower" | "lowest">;
         material: PD.Group<PD.Normalize<{
-            metalness: number;
+            metalness: number; /** Number of cylinders */
             roughness: number;
+            bumpiness: number;
+        }>>;
+        clip: PD.Group<PD.Normalize<{
+            variant: import("../../../mol-util/clip").Clip.Variant;
+            objects: PD.Normalize<{
+                type: any;
+                invert: any;
+                position: any;
+                rotation: any;
+                scale: any;
+            }>[];
         }>>;
     };
     type Params = typeof Params;

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

@@ -110,7 +110,7 @@ var Cylinders;
     }
     Cylinders.transform = transform;
     //
-    Cylinders.Params = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, base_1.BaseGeometry.Params), { sizeFactor: param_definition_1.ParamDefinition.Numeric(1, { min: 0, max: 10, step: 0.1 }), sizeAspectRatio: param_definition_1.ParamDefinition.Numeric(1, { min: 0, max: 3, step: 0.01 }), doubleSided: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.CustomQualityParamInfo), ignoreLight: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory), xrayShaded: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory) });
+    Cylinders.Params = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, base_1.BaseGeometry.Params), { sizeFactor: param_definition_1.ParamDefinition.Numeric(1, { min: 0, max: 10, step: 0.1 }), sizeAspectRatio: param_definition_1.ParamDefinition.Numeric(1, { min: 0, max: 3, step: 0.01 }), doubleSided: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.CustomQualityParamInfo), ignoreLight: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory), xrayShaded: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory), bumpFrequency: param_definition_1.ParamDefinition.Numeric(0, { min: 0, max: 10, step: 0.1 }, base_1.BaseGeometry.ShadingCategory), bumpAmplitude: param_definition_1.ParamDefinition.Numeric(1, { min: 0, max: 5, step: 0.1 }, base_1.BaseGeometry.ShadingCategory) });
     Cylinders.Utils = {
         Params: Cylinders.Params,
         createEmpty: createEmpty,
@@ -156,7 +156,7 @@ var Cylinders;
         var padding = (0, size_data_1.getMaxSize)(size) * props.sizeFactor;
         var invariantBoundingSphere = geometry_1.Sphere3D.clone(cylinders.boundingSphere);
         var boundingSphere = (0, util_2.calculateTransformBoundingSphere)(invariantBoundingSphere, transform.aTransform.ref.value, instanceCount);
-        return (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({ aMapping: cylinders.mappingBuffer, aGroup: cylinders.groupBuffer, aStart: cylinders.startBuffer, aEnd: cylinders.endBuffer, aScale: cylinders.scaleBuffer, aCap: cylinders.capBuffer, elements: cylinders.indexBuffer, boundingSphere: mol_util_1.ValueCell.create(boundingSphere), invariantBoundingSphere: mol_util_1.ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: mol_util_1.ValueCell.create(linear_algebra_1.Vec4.ofSphere(invariantBoundingSphere)) }, color), size), marker), overpaint), transparency), material), clipping), transform), { padding: mol_util_1.ValueCell.create(padding) }), base_1.BaseGeometry.createValues(props, counts)), { uSizeFactor: mol_util_1.ValueCell.create(props.sizeFactor * props.sizeAspectRatio), dDoubleSided: mol_util_1.ValueCell.create(props.doubleSided), dIgnoreLight: mol_util_1.ValueCell.create(props.ignoreLight), dXrayShaded: mol_util_1.ValueCell.create(props.xrayShaded) });
+        return (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({ aMapping: cylinders.mappingBuffer, aGroup: cylinders.groupBuffer, aStart: cylinders.startBuffer, aEnd: cylinders.endBuffer, aScale: cylinders.scaleBuffer, aCap: cylinders.capBuffer, elements: cylinders.indexBuffer, boundingSphere: mol_util_1.ValueCell.create(boundingSphere), invariantBoundingSphere: mol_util_1.ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: mol_util_1.ValueCell.create(linear_algebra_1.Vec4.ofSphere(invariantBoundingSphere)) }, color), size), marker), overpaint), transparency), material), clipping), transform), { padding: mol_util_1.ValueCell.create(padding) }), base_1.BaseGeometry.createValues(props, counts)), { uSizeFactor: mol_util_1.ValueCell.create(props.sizeFactor * props.sizeAspectRatio), uDoubleSided: mol_util_1.ValueCell.create(props.doubleSided), dIgnoreLight: mol_util_1.ValueCell.create(props.ignoreLight), dXrayShaded: mol_util_1.ValueCell.create(props.xrayShaded), uBumpFrequency: mol_util_1.ValueCell.create(props.bumpFrequency), uBumpAmplitude: mol_util_1.ValueCell.create(props.bumpAmplitude) });
     }
     function createValuesSimple(cylinders, props, colorValue, sizeValue, transform) {
         var s = base_1.BaseGeometry.createSimple(colorValue, sizeValue, transform);
@@ -166,9 +166,11 @@ var Cylinders;
     function updateValues(values, props) {
         base_1.BaseGeometry.updateValues(values, props);
         mol_util_1.ValueCell.updateIfChanged(values.uSizeFactor, props.sizeFactor * props.sizeAspectRatio);
-        mol_util_1.ValueCell.updateIfChanged(values.dDoubleSided, props.doubleSided);
+        mol_util_1.ValueCell.updateIfChanged(values.uDoubleSided, props.doubleSided);
         mol_util_1.ValueCell.updateIfChanged(values.dIgnoreLight, props.ignoreLight);
         mol_util_1.ValueCell.updateIfChanged(values.dXrayShaded, props.xrayShaded);
+        mol_util_1.ValueCell.updateIfChanged(values.uBumpFrequency, props.bumpFrequency);
+        mol_util_1.ValueCell.updateIfChanged(values.uBumpAmplitude, props.bumpAmplitude);
     }
     function updateBoundingSphere(values, cylinders) {
         var invariantBoundingSphere = geometry_1.Sphere3D.clone(cylinders.boundingSphere);

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

@@ -76,6 +76,17 @@ export declare namespace DirectVolume {
         material: PD.Group<PD.Normalize<{
             metalness: number;
             roughness: number;
+            bumpiness: number;
+        }>>;
+        clip: PD.Group<PD.Normalize<{
+            variant: import("../../../mol-util/clip").Clip.Variant;
+            objects: PD.Normalize<{
+                type: any;
+                invert: any;
+                position: any;
+                rotation: any;
+                scale: any;
+            }>[];
         }>>;
     };
     type Params = typeof Params;

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

@@ -207,7 +207,7 @@ var DirectVolume;
         var singleLayer = props.renderMode.name === 'isosurface'
             ? props.renderMode.params.singleLayer
             : false;
-        return (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, color), marker), overpaint), transparency), material), clipping), transform), base_1.BaseGeometry.createValues(props, counts)), { aPosition: mol_util_1.ValueCell.create(VolumeBox.vertices), elements: mol_util_1.ValueCell.create(VolumeBox.indices), boundingSphere: mol_util_1.ValueCell.create(boundingSphere), invariantBoundingSphere: mol_util_1.ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: mol_util_1.ValueCell.create(linear_algebra_1.Vec4.ofSphere(invariantBoundingSphere)), uIsoValue: mol_util_1.ValueCell.create(getNormalizedIsoValue((0, linear_algebra_1.Vec2)(), isoValue, directVolume.gridStats.ref.value)), uBboxMin: bboxMin, uBboxMax: bboxMax, uBboxSize: bboxSize, uMaxSteps: mol_util_1.ValueCell.create(getMaxSteps(gridDimension.ref.value, props.stepsPerCell)), uStepScale: mol_util_1.ValueCell.create(getStepScale(directVolume.cellDim.ref.value, props.stepsPerCell)), uJumpLength: mol_util_1.ValueCell.create(props.jumpLength), uTransform: gridTransform, uGridDim: gridDimension, dRenderMode: mol_util_1.ValueCell.create(props.renderMode.name), tTransferTex: transferTex, uTransferScale: mol_util_1.ValueCell.create(getTransferScale(props.stepsPerCell)), dGridTexType: mol_util_1.ValueCell.create(gridTexture.ref.value.getDepth() > 0 ? '3d' : '2d'), uGridTexDim: gridTextureDim, tGridTex: gridTexture, uGridStats: gridStats, uCellDim: directVolume.cellDim, uCartnToUnit: directVolume.cartnToUnit, uUnitToCartn: directVolume.unitToCartn, dPackedGroup: directVolume.packedGroup, dSingleLayer: mol_util_1.ValueCell.create(singleLayer), dDoubleSided: mol_util_1.ValueCell.create(props.doubleSided), dFlatShaded: mol_util_1.ValueCell.create(props.flatShaded), dFlipSided: mol_util_1.ValueCell.create(props.flipSided), dIgnoreLight: mol_util_1.ValueCell.create(props.ignoreLight), dXrayShaded: mol_util_1.ValueCell.create(props.xrayShaded) });
+        return (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, color), marker), overpaint), transparency), material), clipping), transform), base_1.BaseGeometry.createValues(props, counts)), { aPosition: mol_util_1.ValueCell.create(VolumeBox.vertices), elements: mol_util_1.ValueCell.create(VolumeBox.indices), boundingSphere: mol_util_1.ValueCell.create(boundingSphere), invariantBoundingSphere: mol_util_1.ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: mol_util_1.ValueCell.create(linear_algebra_1.Vec4.ofSphere(invariantBoundingSphere)), uIsoValue: mol_util_1.ValueCell.create(getNormalizedIsoValue((0, linear_algebra_1.Vec2)(), isoValue, directVolume.gridStats.ref.value)), uBboxMin: bboxMin, uBboxMax: bboxMax, uBboxSize: bboxSize, uMaxSteps: mol_util_1.ValueCell.create(getMaxSteps(gridDimension.ref.value, props.stepsPerCell)), uStepScale: mol_util_1.ValueCell.create(getStepScale(directVolume.cellDim.ref.value, props.stepsPerCell)), uJumpLength: mol_util_1.ValueCell.create(props.jumpLength), uTransform: gridTransform, uGridDim: gridDimension, dRenderMode: mol_util_1.ValueCell.create(props.renderMode.name), tTransferTex: transferTex, uTransferScale: mol_util_1.ValueCell.create(getTransferScale(props.stepsPerCell)), dGridTexType: mol_util_1.ValueCell.create(gridTexture.ref.value.getDepth() > 0 ? '3d' : '2d'), uGridTexDim: gridTextureDim, tGridTex: gridTexture, uGridStats: gridStats, uCellDim: directVolume.cellDim, uCartnToUnit: directVolume.cartnToUnit, uUnitToCartn: directVolume.unitToCartn, dPackedGroup: directVolume.packedGroup, dSingleLayer: mol_util_1.ValueCell.create(singleLayer), uDoubleSided: mol_util_1.ValueCell.create(props.doubleSided), dFlatShaded: mol_util_1.ValueCell.create(props.flatShaded), dFlipSided: mol_util_1.ValueCell.create(props.flipSided), dIgnoreLight: mol_util_1.ValueCell.create(props.ignoreLight), dXrayShaded: mol_util_1.ValueCell.create(props.xrayShaded) });
     }
     function createValuesSimple(directVolume, props, colorValue, sizeValue, transform) {
         var s = base_1.BaseGeometry.createSimple(colorValue, sizeValue, transform);
@@ -216,7 +216,7 @@ var DirectVolume;
     }
     function updateValues(values, props) {
         base_1.BaseGeometry.updateValues(values, props);
-        mol_util_1.ValueCell.updateIfChanged(values.dDoubleSided, props.doubleSided);
+        mol_util_1.ValueCell.updateIfChanged(values.uDoubleSided, props.doubleSided);
         mol_util_1.ValueCell.updateIfChanged(values.dFlatShaded, props.flatShaded);
         mol_util_1.ValueCell.updateIfChanged(values.dFlipSided, props.flipSided);
         mol_util_1.ValueCell.updateIfChanged(values.dIgnoreLight, props.ignoreLight);

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

@@ -37,6 +37,17 @@ declare namespace Image {
         material: PD.Group<PD.Normalize<{
             metalness: number;
             roughness: number;
+            bumpiness: number;
+        }>>;
+        clip: PD.Group<PD.Normalize<{
+            variant: import("../../../mol-util/clip").Clip.Variant;
+            objects: PD.Normalize<{
+                type: any;
+                invert: any;
+                position: any;
+                rotation: any;
+                scale: any;
+            }>[];
         }>>;
     };
     type Params = typeof Params;

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

@@ -44,6 +44,18 @@ export declare namespace Lines {
         material: PD.Group<PD.Normalize<{
             metalness: number;
             roughness: number;
+            /** Number of lines */
+            bumpiness: number;
+        }>>;
+        clip: PD.Group<PD.Normalize<{
+            variant: import("../../../mol-util/clip").Clip.Variant;
+            objects: PD.Normalize<{
+                type: any;
+                invert: any;
+                position: any;
+                rotation: any;
+                scale: any;
+            }>[];
         }>>;
     };
     type Params = typeof Params;

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

@@ -168,7 +168,7 @@ var Lines;
         var counts = { drawCount: lines.lineCount * 2 * 3, vertexCount: lines.lineCount * 4, groupCount: groupCount, instanceCount: instanceCount };
         var invariantBoundingSphere = geometry_1.Sphere3D.clone(lines.boundingSphere);
         var boundingSphere = (0, util_2.calculateTransformBoundingSphere)(invariantBoundingSphere, transform.aTransform.ref.value, instanceCount);
-        return (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({ aMapping: lines.mappingBuffer, aGroup: lines.groupBuffer, aStart: lines.startBuffer, aEnd: lines.endBuffer, elements: lines.indexBuffer, boundingSphere: mol_util_1.ValueCell.create(boundingSphere), invariantBoundingSphere: mol_util_1.ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: mol_util_1.ValueCell.create(linear_algebra_1.Vec4.ofSphere(invariantBoundingSphere)) }, color), size), marker), overpaint), transparency), material), clipping), transform), base_1.BaseGeometry.createValues(props, counts)), { uSizeFactor: mol_util_1.ValueCell.create(props.sizeFactor), dLineSizeAttenuation: mol_util_1.ValueCell.create(props.lineSizeAttenuation), dDoubleSided: mol_util_1.ValueCell.create(true), dFlipSided: mol_util_1.ValueCell.create(false) });
+        return (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({ aMapping: lines.mappingBuffer, aGroup: lines.groupBuffer, aStart: lines.startBuffer, aEnd: lines.endBuffer, elements: lines.indexBuffer, boundingSphere: mol_util_1.ValueCell.create(boundingSphere), invariantBoundingSphere: mol_util_1.ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: mol_util_1.ValueCell.create(linear_algebra_1.Vec4.ofSphere(invariantBoundingSphere)) }, color), size), marker), overpaint), transparency), material), clipping), transform), base_1.BaseGeometry.createValues(props, counts)), { uSizeFactor: mol_util_1.ValueCell.create(props.sizeFactor), dLineSizeAttenuation: mol_util_1.ValueCell.create(props.lineSizeAttenuation), uDoubleSided: mol_util_1.ValueCell.create(true), dFlipSided: mol_util_1.ValueCell.create(false) });
     }
     function createValuesSimple(lines, props, colorValue, sizeValue, transform) {
         var s = base_1.BaseGeometry.createSimple(colorValue, sizeValue, transform);

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

@@ -10,7 +10,6 @@ export declare type MarkerData = {
     uMarker: ValueCell<number>;
     tMarker: ValueCell<TextureImage<Uint8Array>>;
     uMarkerTexDim: ValueCell<Vec2>;
-    dMarkerType: ValueCell<string>;
     markerAverage: ValueCell<number>;
     markerStatus: ValueCell<number>;
 };

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

@@ -56,7 +56,6 @@ function createMarkers(count, markerData) {
         value_cell_1.ValueCell.updateIfChanged(markerData.uMarker, 0);
         value_cell_1.ValueCell.update(markerData.tMarker, markers);
         value_cell_1.ValueCell.update(markerData.uMarkerTexDim, linear_algebra_1.Vec2.create(markers.width, markers.height));
-        value_cell_1.ValueCell.updateIfChanged(markerData.dMarkerType, status === -1 ? 'groupInstance' : 'uniform');
         value_cell_1.ValueCell.updateIfChanged(markerData.markerAverage, average);
         value_cell_1.ValueCell.updateIfChanged(markerData.markerStatus, status);
         return markerData;
@@ -68,7 +67,6 @@ function createMarkers(count, markerData) {
             uMarkerTexDim: value_cell_1.ValueCell.create(linear_algebra_1.Vec2.create(markers.width, markers.height)),
             markerAverage: value_cell_1.ValueCell.create(average),
             markerStatus: value_cell_1.ValueCell.create(status),
-            dMarkerType: value_cell_1.ValueCell.create('uniform'),
         };
     }
 }
@@ -79,7 +77,6 @@ function createEmptyMarkers(markerData) {
         value_cell_1.ValueCell.updateIfChanged(markerData.uMarker, 0);
         value_cell_1.ValueCell.update(markerData.tMarker, emptyMarkerTexture);
         value_cell_1.ValueCell.update(markerData.uMarkerTexDim, linear_algebra_1.Vec2.create(1, 1));
-        value_cell_1.ValueCell.updateIfChanged(markerData.dMarkerType, 'uniform');
         value_cell_1.ValueCell.updateIfChanged(markerData.markerAverage, 0);
         value_cell_1.ValueCell.updateIfChanged(markerData.markerStatus, 0);
         return markerData;
@@ -91,7 +88,6 @@ function createEmptyMarkers(markerData) {
             uMarkerTexDim: value_cell_1.ValueCell.create(linear_algebra_1.Vec2.create(1, 1)),
             markerAverage: value_cell_1.ValueCell.create(0),
             markerStatus: value_cell_1.ValueCell.create(0),
-            dMarkerType: value_cell_1.ValueCell.create('uniform'),
         };
     }
 }

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

@@ -306,7 +306,7 @@ function applyMeshSubstanceSmoothing(values, resolution, stride, webgl, colorTex
         colorType: values.dSubstanceType.ref.value,
         boundingSphere: values.boundingSphere.ref.value,
         invariantBoundingSphere: values.invariantBoundingSphere.ref.value,
-        itemSize: 3
+        itemSize: 4
     }, resolution, stride, webgl, colorTexture);
     if (smoothingData.kind === 'volume') {
         mol_util_1.ValueCell.updateIfChanged(values.dSubstanceType, smoothingData.type);

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

@@ -62,11 +62,24 @@ export declare namespace Mesh {
         flatShaded: PD.BooleanParam;
         ignoreLight: PD.BooleanParam;
         xrayShaded: PD.BooleanParam;
+        bumpFrequency: PD.Numeric;
+        bumpAmplitude: PD.Numeric;
         alpha: PD.Numeric;
         quality: PD.Select<"auto" | "medium" | "high" | "low" | "custom" | "highest" | "higher" | "lower" | "lowest">;
         material: PD.Group<PD.Normalize<{
             metalness: number;
             roughness: number;
+            bumpiness: number;
+        }>>;
+        clip: PD.Group<PD.Normalize<{
+            variant: import("../../../mol-util/clip").Clip.Variant;
+            objects: PD.Normalize<{
+                type: any;
+                invert: any;
+                position: any;
+                rotation: any;
+                scale: any;
+            }>[];
         }>>;
     };
     type Params = typeof Params;

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

@@ -554,7 +554,7 @@ var Mesh;
     }
     Mesh.smoothEdges = smoothEdges;
     //
-    Mesh.Params = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, base_1.BaseGeometry.Params), { doubleSided: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.CustomQualityParamInfo), flipSided: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory), flatShaded: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory), ignoreLight: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory), xrayShaded: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory) });
+    Mesh.Params = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, base_1.BaseGeometry.Params), { doubleSided: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.CustomQualityParamInfo), flipSided: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory), flatShaded: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory), ignoreLight: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory), xrayShaded: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory), bumpFrequency: param_definition_1.ParamDefinition.Numeric(0, { min: 0, max: 10, step: 0.1 }, base_1.BaseGeometry.ShadingCategory), bumpAmplitude: param_definition_1.ParamDefinition.Numeric(1, { min: 0, max: 5, step: 0.1 }, base_1.BaseGeometry.ShadingCategory) });
     Mesh.Utils = {
         Params: Mesh.Params,
         createEmpty: createEmpty,
@@ -596,7 +596,7 @@ var Mesh;
         var counts = { drawCount: mesh.triangleCount * 3, vertexCount: mesh.vertexCount, groupCount: groupCount, instanceCount: instanceCount };
         var invariantBoundingSphere = geometry_1.Sphere3D.clone(mesh.boundingSphere);
         var boundingSphere = (0, util_3.calculateTransformBoundingSphere)(invariantBoundingSphere, transform.aTransform.ref.value, instanceCount);
-        return (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({ aPosition: mesh.vertexBuffer, aNormal: mesh.normalBuffer, aGroup: mesh.groupBuffer, elements: mesh.indexBuffer, boundingSphere: mol_util_1.ValueCell.create(boundingSphere), invariantBoundingSphere: mol_util_1.ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: mol_util_1.ValueCell.create(linear_algebra_1.Vec4.ofSphere(invariantBoundingSphere)) }, color), marker), overpaint), transparency), material), clipping), transform), base_1.BaseGeometry.createValues(props, counts)), { dDoubleSided: mol_util_1.ValueCell.create(props.doubleSided), dFlatShaded: mol_util_1.ValueCell.create(props.flatShaded), dFlipSided: mol_util_1.ValueCell.create(props.flipSided), dIgnoreLight: mol_util_1.ValueCell.create(props.ignoreLight), dXrayShaded: mol_util_1.ValueCell.create(props.xrayShaded), meta: mol_util_1.ValueCell.create(mesh.meta) });
+        return (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({ aPosition: mesh.vertexBuffer, aNormal: mesh.normalBuffer, aGroup: mesh.groupBuffer, elements: mesh.indexBuffer, boundingSphere: mol_util_1.ValueCell.create(boundingSphere), invariantBoundingSphere: mol_util_1.ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: mol_util_1.ValueCell.create(linear_algebra_1.Vec4.ofSphere(invariantBoundingSphere)) }, color), marker), overpaint), transparency), material), clipping), transform), base_1.BaseGeometry.createValues(props, counts)), { uDoubleSided: mol_util_1.ValueCell.create(props.doubleSided), dFlatShaded: mol_util_1.ValueCell.create(props.flatShaded), dFlipSided: mol_util_1.ValueCell.create(props.flipSided), dIgnoreLight: mol_util_1.ValueCell.create(props.ignoreLight), dXrayShaded: mol_util_1.ValueCell.create(props.xrayShaded), uBumpFrequency: mol_util_1.ValueCell.create(props.bumpFrequency), uBumpAmplitude: mol_util_1.ValueCell.create(props.bumpAmplitude), meta: mol_util_1.ValueCell.create(mesh.meta) });
     }
     function createValuesSimple(mesh, props, colorValue, sizeValue, transform) {
         var s = base_1.BaseGeometry.createSimple(colorValue, sizeValue, transform);
@@ -605,11 +605,13 @@ var Mesh;
     }
     function updateValues(values, props) {
         base_1.BaseGeometry.updateValues(values, props);
-        mol_util_1.ValueCell.updateIfChanged(values.dDoubleSided, props.doubleSided);
+        mol_util_1.ValueCell.updateIfChanged(values.uDoubleSided, props.doubleSided);
         mol_util_1.ValueCell.updateIfChanged(values.dFlatShaded, props.flatShaded);
         mol_util_1.ValueCell.updateIfChanged(values.dFlipSided, props.flipSided);
         mol_util_1.ValueCell.updateIfChanged(values.dIgnoreLight, props.ignoreLight);
         mol_util_1.ValueCell.updateIfChanged(values.dXrayShaded, props.xrayShaded);
+        mol_util_1.ValueCell.updateIfChanged(values.uBumpFrequency, props.bumpFrequency);
+        mol_util_1.ValueCell.updateIfChanged(values.uBumpAmplitude, props.bumpAmplitude);
     }
     function updateBoundingSphere(values, mesh) {
         var invariantBoundingSphere = geometry_1.Sphere3D.clone(mesh.boundingSphere);

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

@@ -44,6 +44,17 @@ export declare namespace Points {
         material: PD.Group<PD.Normalize<{
             metalness: number;
             roughness: number;
+            bumpiness: number;
+        }>>;
+        clip: PD.Group<PD.Normalize<{
+            variant: import("../../../mol-util/clip").Clip.Variant;
+            objects: PD.Normalize<{
+                type: any;
+                invert: any;
+                position: any;
+                rotation: any;
+                scale: any;
+            }>[];
         }>>;
     };
     type Params = typeof Params;