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

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

@@ -88,7 +88,7 @@ export var Spheres;
         ValueCell.update(spheres.groupBuffer, groups);
         return spheres;
     }
-    Spheres.Params = __assign(__assign({}, BaseGeometry.Params), { sizeFactor: PD.Numeric(1, { min: 0, max: 10, step: 0.1 }), doubleSided: PD.Boolean(false, BaseGeometry.CustomQualityParamInfo), ignoreLight: PD.Boolean(false, BaseGeometry.ShadingCategory), xrayShaded: PD.Boolean(false, BaseGeometry.ShadingCategory) });
+    Spheres.Params = __assign(__assign({}, BaseGeometry.Params), { sizeFactor: PD.Numeric(1, { min: 0, max: 10, step: 0.1 }), doubleSided: PD.Boolean(false, BaseGeometry.CustomQualityParamInfo), ignoreLight: PD.Boolean(false, BaseGeometry.ShadingCategory), xrayShaded: PD.Boolean(false, BaseGeometry.ShadingCategory), bumpFrequency: PD.Numeric(0, { min: 0, max: 10, step: 0.1 }, BaseGeometry.ShadingCategory), bumpAmplitude: PD.Numeric(1, { min: 0, max: 5, step: 0.1 }, BaseGeometry.ShadingCategory) });
     Spheres.Utils = {
         Params: Spheres.Params,
         createEmpty: createEmpty,
@@ -132,7 +132,7 @@ export var Spheres;
         var padding = spheres.boundingSphere.radius ? getMaxSize(size) * props.sizeFactor : 0;
         var invariantBoundingSphere = Sphere3D.expand(Sphere3D(), spheres.boundingSphere, padding);
         var boundingSphere = calculateTransformBoundingSphere(invariantBoundingSphere, transform.aTransform.ref.value, instanceCount);
-        return __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({ aPosition: spheres.centerBuffer, aMapping: spheres.mappingBuffer, aGroup: spheres.groupBuffer, elements: spheres.indexBuffer, boundingSphere: ValueCell.create(boundingSphere), invariantBoundingSphere: ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: ValueCell.create(Vec4.ofSphere(invariantBoundingSphere)) }, color), size), marker), overpaint), transparency), material), clipping), transform), { padding: ValueCell.create(padding) }), BaseGeometry.createValues(props, counts)), { uSizeFactor: ValueCell.create(props.sizeFactor), dDoubleSided: ValueCell.create(props.doubleSided), dIgnoreLight: ValueCell.create(props.ignoreLight), dXrayShaded: ValueCell.create(props.xrayShaded) });
+        return __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({ aPosition: spheres.centerBuffer, aMapping: spheres.mappingBuffer, aGroup: spheres.groupBuffer, elements: spheres.indexBuffer, boundingSphere: ValueCell.create(boundingSphere), invariantBoundingSphere: ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: ValueCell.create(Vec4.ofSphere(invariantBoundingSphere)) }, color), size), marker), overpaint), transparency), material), clipping), transform), { padding: ValueCell.create(padding) }), BaseGeometry.createValues(props, counts)), { uSizeFactor: ValueCell.create(props.sizeFactor), uDoubleSided: ValueCell.create(props.doubleSided), dIgnoreLight: ValueCell.create(props.ignoreLight), dXrayShaded: ValueCell.create(props.xrayShaded), uBumpFrequency: ValueCell.create(props.bumpFrequency), uBumpAmplitude: ValueCell.create(props.bumpAmplitude) });
     }
     function createValuesSimple(spheres, props, colorValue, sizeValue, transform) {
         var s = BaseGeometry.createSimple(colorValue, sizeValue, transform);
@@ -142,9 +142,11 @@ export var Spheres;
     function updateValues(values, props) {
         BaseGeometry.updateValues(values, props);
         ValueCell.updateIfChanged(values.uSizeFactor, props.sizeFactor);
-        ValueCell.updateIfChanged(values.dDoubleSided, props.doubleSided);
+        ValueCell.updateIfChanged(values.uDoubleSided, props.doubleSided);
         ValueCell.updateIfChanged(values.dIgnoreLight, props.ignoreLight);
         ValueCell.updateIfChanged(values.dXrayShaded, props.xrayShaded);
+        ValueCell.updateIfChanged(values.uBumpFrequency, props.bumpFrequency);
+        ValueCell.updateIfChanged(values.uBumpAmplitude, props.bumpAmplitude);
     }
     function updateBoundingSphere(values, spheres) {
         var padding = spheres.boundingSphere.radius

package/lib/mol-geo/geometry/substance-data.js

@@ -10,13 +10,13 @@ import { createNullTexture } from '../../mol-gl/webgl/texture';
 import { Material } from '../../mol-util/material';
 export function applySubstanceMaterial(array, start, end, material) {
     for (var i = start; i < end; ++i) {
-        Material.toArray(material, array, i * 3);
-        array[i * 3 + 2] = 255;
+        Material.toArray(material, array, i * 4);
+        array[i * 4 + 3] = 255;
     }
     return true;
 }
 export function clearSubstance(array, start, end) {
-    array.fill(0, start * 3, end * 3);
+    array.fill(0, start * 4, end * 4);
     return true;
 }
 export function createSubstance(count, substanceData) {

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

@@ -63,6 +63,17 @@ export declare namespace Text {
         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/mol-geo/geometry/texture-mesh/color-smoothing.js

@@ -397,10 +397,10 @@ export function applyTextureMeshSubstanceSmoothing(values, resolution, stride, w
     if (!isSupportedSubstanceType(values.dSubstanceType.ref.value))
         return;
     stride *= 3; // triple because TextureMesh is never indexed (no elements buffer)
-    if (!webgl.namedTextures[ColorSmoothingRgbName]) {
-        webgl.namedTextures[ColorSmoothingRgbName] = webgl.resources.texture('image-uint8', 'rgb', 'ubyte', 'nearest');
+    if (!webgl.namedTextures[ColorSmoothingRgbaName]) {
+        webgl.namedTextures[ColorSmoothingRgbaName] = webgl.resources.texture('image-uint8', 'rgba', 'ubyte', 'nearest');
     }
-    var colorData = webgl.namedTextures[ColorSmoothingRgbName];
+    var colorData = webgl.namedTextures[ColorSmoothingRgbaName];
     colorData.load(values.tSubstance.ref.value);
     var smoothingData = calcTextureMeshColorSmoothing({
         vertexCount: values.uVertexCount.ref.value,

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

@@ -45,11 +45,24 @@ export declare namespace TextureMesh {
         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/mol-geo/geometry/texture-mesh/texture-mesh.js

@@ -86,7 +86,7 @@ export var TextureMesh;
         return create(0, 0, vt, gt, nt, bs, textureMesh);
     }
     TextureMesh.createEmpty = createEmpty;
-    TextureMesh.Params = __assign(__assign({}, BaseGeometry.Params), { doubleSided: PD.Boolean(false, BaseGeometry.CustomQualityParamInfo), flipSided: PD.Boolean(false, BaseGeometry.ShadingCategory), flatShaded: PD.Boolean(false, BaseGeometry.ShadingCategory), ignoreLight: PD.Boolean(false, BaseGeometry.ShadingCategory), xrayShaded: PD.Boolean(false, BaseGeometry.ShadingCategory) });
+    TextureMesh.Params = __assign(__assign({}, BaseGeometry.Params), { doubleSided: PD.Boolean(false, BaseGeometry.CustomQualityParamInfo), flipSided: PD.Boolean(false, BaseGeometry.ShadingCategory), flatShaded: PD.Boolean(false, BaseGeometry.ShadingCategory), ignoreLight: PD.Boolean(false, BaseGeometry.ShadingCategory), xrayShaded: PD.Boolean(false, BaseGeometry.ShadingCategory), bumpFrequency: PD.Numeric(0, { min: 0, max: 10, step: 0.1 }, BaseGeometry.ShadingCategory), bumpAmplitude: PD.Numeric(1, { min: 0, max: 5, step: 0.1 }, BaseGeometry.ShadingCategory) });
     TextureMesh.Utils = {
         Params: TextureMesh.Params,
         createEmpty: createEmpty,
@@ -110,7 +110,7 @@ export var TextureMesh;
         var counts = { drawCount: textureMesh.vertexCount, vertexCount: textureMesh.vertexCount, groupCount: groupCount, instanceCount: instanceCount };
         var invariantBoundingSphere = Sphere3D.clone(textureMesh.boundingSphere);
         var boundingSphere = calculateTransformBoundingSphere(invariantBoundingSphere, transform.aTransform.ref.value, instanceCount);
-        return __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({ uGeoTexDim: textureMesh.geoTextureDim, tPosition: textureMesh.vertexTexture, tGroup: textureMesh.groupTexture, tNormal: textureMesh.normalTexture, boundingSphere: ValueCell.create(boundingSphere), invariantBoundingSphere: ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: ValueCell.create(Vec4.ofSphere(invariantBoundingSphere)) }, color), marker), overpaint), transparency), substance), clipping), transform), BaseGeometry.createValues(props, counts)), { dDoubleSided: ValueCell.create(props.doubleSided), dFlatShaded: ValueCell.create(props.flatShaded), dFlipSided: ValueCell.create(props.flipSided), dIgnoreLight: ValueCell.create(props.ignoreLight), dXrayShaded: ValueCell.create(props.xrayShaded), dGeoTexture: ValueCell.create(true), meta: ValueCell.create(textureMesh.meta) });
+        return __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({ uGeoTexDim: textureMesh.geoTextureDim, tPosition: textureMesh.vertexTexture, tGroup: textureMesh.groupTexture, tNormal: textureMesh.normalTexture, boundingSphere: ValueCell.create(boundingSphere), invariantBoundingSphere: ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: ValueCell.create(Vec4.ofSphere(invariantBoundingSphere)) }, color), marker), overpaint), transparency), substance), clipping), transform), BaseGeometry.createValues(props, counts)), { uDoubleSided: ValueCell.create(props.doubleSided), dFlatShaded: ValueCell.create(props.flatShaded), dFlipSided: ValueCell.create(props.flipSided), dIgnoreLight: ValueCell.create(props.ignoreLight), dXrayShaded: ValueCell.create(props.xrayShaded), uBumpFrequency: ValueCell.create(props.bumpFrequency), uBumpAmplitude: ValueCell.create(props.bumpAmplitude), dGeoTexture: ValueCell.create(true), meta: ValueCell.create(textureMesh.meta) });
     }
     function createValuesSimple(textureMesh, props, colorValue, sizeValue, transform) {
         var s = BaseGeometry.createSimple(colorValue, sizeValue, transform);
@@ -119,11 +119,13 @@ export var TextureMesh;
     }
     function updateValues(values, props) {
         BaseGeometry.updateValues(values, props);
-        ValueCell.updateIfChanged(values.dDoubleSided, props.doubleSided);
+        ValueCell.updateIfChanged(values.uDoubleSided, props.doubleSided);
         ValueCell.updateIfChanged(values.dFlatShaded, props.flatShaded);
         ValueCell.updateIfChanged(values.dFlipSided, props.flipSided);
         ValueCell.updateIfChanged(values.dIgnoreLight, props.ignoreLight);
         ValueCell.updateIfChanged(values.dXrayShaded, props.xrayShaded);
+        ValueCell.updateIfChanged(values.uBumpFrequency, props.bumpFrequency);
+        ValueCell.updateIfChanged(values.uBumpAmplitude, props.bumpAmplitude);
     }
     function updateBoundingSphere(values, textureMesh) {
         var invariantBoundingSphere = Sphere3D.clone(textureMesh.boundingSphere);

package/lib/mol-gl/render-object.d.ts

@@ -14,6 +14,7 @@ import { TextValues } from './renderable/text';
 import { TextureMeshValues } from './renderable/texture-mesh';
 import { ImageValues } from './renderable/image';
 import { CylindersValues } from './renderable/cylinders';
+import { GraphicsRenderVariant } from './webgl/render-item';
 export declare const getNextMaterialId: () => number;
 export interface GraphicsRenderObject<T extends RenderObjectType = RenderObjectType> {
     readonly id: number;
@@ -25,4 +26,4 @@ export interface GraphicsRenderObject<T extends RenderObjectType = RenderObjectT
 export declare type RenderObjectType = 'mesh' | 'points' | 'spheres' | 'cylinders' | 'text' | 'lines' | 'direct-volume' | 'image' | 'texture-mesh';
 export declare type RenderObjectValues<T extends RenderObjectType> = T extends 'mesh' ? MeshValues : T extends 'points' ? PointsValues : T extends 'spheres' ? SpheresValues : T extends 'cylinders' ? CylindersValues : T extends 'text' ? TextValues : T extends 'lines' ? LinesValues : T extends 'direct-volume' ? DirectVolumeValues : T extends 'image' ? ImageValues : T extends 'texture-mesh' ? TextureMeshValues : never;
 export declare function createRenderObject<T extends RenderObjectType>(type: T, values: RenderObjectValues<T>, state: RenderableState, materialId: number): GraphicsRenderObject<T>;
-export declare function createRenderable<T extends RenderObjectType>(ctx: WebGLContext, o: GraphicsRenderObject<T>): Renderable<any>;
+export declare function createRenderable<T extends RenderObjectType>(ctx: WebGLContext, o: GraphicsRenderObject<T>, variants: GraphicsRenderVariant[]): Renderable<any>;

package/lib/mol-gl/render-object.js

@@ -19,17 +19,17 @@ export var getNextMaterialId = idFactory(0, 0x7FFFFFFF);
 export function createRenderObject(type, values, state, materialId) {
     return { id: getNextId(), type: type, values: values, state: state, materialId: materialId };
 }
-export function createRenderable(ctx, o) {
+export function createRenderable(ctx, o, variants) {
     switch (o.type) {
-        case 'mesh': return MeshRenderable(ctx, o.id, o.values, o.state, o.materialId);
-        case 'points': return PointsRenderable(ctx, o.id, o.values, o.state, o.materialId);
-        case 'spheres': return SpheresRenderable(ctx, o.id, o.values, o.state, o.materialId);
-        case 'cylinders': return CylindersRenderable(ctx, o.id, o.values, o.state, o.materialId);
-        case 'text': return TextRenderable(ctx, o.id, o.values, o.state, o.materialId);
-        case 'lines': return LinesRenderable(ctx, o.id, o.values, o.state, o.materialId);
-        case 'direct-volume': return DirectVolumeRenderable(ctx, o.id, o.values, o.state, o.materialId);
-        case 'image': return ImageRenderable(ctx, o.id, o.values, o.state, o.materialId);
-        case 'texture-mesh': return TextureMeshRenderable(ctx, o.id, o.values, o.state, o.materialId);
+        case 'mesh': return MeshRenderable(ctx, o.id, o.values, o.state, o.materialId, variants);
+        case 'points': return PointsRenderable(ctx, o.id, o.values, o.state, o.materialId, variants);
+        case 'spheres': return SpheresRenderable(ctx, o.id, o.values, o.state, o.materialId, variants);
+        case 'cylinders': return CylindersRenderable(ctx, o.id, o.values, o.state, o.materialId, variants);
+        case 'text': return TextRenderable(ctx, o.id, o.values, o.state, o.materialId, variants);
+        case 'lines': return LinesRenderable(ctx, o.id, o.values, o.state, o.materialId, variants);
+        case 'direct-volume': return DirectVolumeRenderable(ctx, o.id, o.values, o.state, o.materialId, variants);
+        case 'image': return ImageRenderable(ctx, o.id, o.values, o.state, o.materialId, variants);
+        case 'texture-mesh': return TextureMeshRenderable(ctx, o.id, o.values, o.state, o.materialId, variants);
     }
     throw new Error('unsupported type');
 }

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

@@ -1,11 +1,12 @@
 /**
- * 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>
  */
 import { Renderable, RenderableState } from '../renderable';
 import { WebGLContext } from '../webgl/context';
-import { AttributeSpec, Values, ElementsSpec, ValueSpec, DefineSpec } from './schema';
+import { GraphicsRenderVariant } from '../webgl/render-item';
+import { AttributeSpec, Values, ElementsSpec, ValueSpec, DefineSpec, UniformSpec } from './schema';
 export declare const CylindersSchema: {
     aGroup: AttributeSpec<"float32">;
     aStart: AttributeSpec<"float32">;
@@ -15,24 +16,34 @@ export declare const CylindersSchema: {
     aCap: AttributeSpec<"float32">;
     elements: ElementsSpec<"uint32">;
     padding: ValueSpec<"number">;
-    dDoubleSided: DefineSpec<"boolean">;
+    uDoubleSided: UniformSpec<"b">;
     dIgnoreLight: DefineSpec<"boolean">;
     dXrayShaded: DefineSpec<"boolean">;
-    uSize: import("./schema").UniformSpec<"f">;
-    uSizeTexDim: import("./schema").UniformSpec<"v2">;
+    uBumpFrequency: UniformSpec<"f">;
+    uBumpAmplitude: UniformSpec<"f">;
+    uSize: UniformSpec<"f">;
+    uSizeTexDim: UniformSpec<"v2">;
     tSize: import("./schema").TextureSpec<"image-uint8">;
     dSizeType: DefineSpec<"string">;
-    uSizeFactor: import("./schema").UniformSpec<"f">;
+    uSizeFactor: UniformSpec<"f">;
     dLightCount: DefineSpec<"number">;
+    dClipObjectCount: DefineSpec<"number">;
+    dClipVariant: DefineSpec<"string">;
+    uClipObjectType: UniformSpec<"i[]">;
+    uClipObjectInvert: UniformSpec<"b[]">;
+    uClipObjectPosition: UniformSpec<"v3[]">;
+    uClipObjectRotation: UniformSpec<"v4[]">;
+    uClipObjectScale: UniformSpec<"v3[]">;
     aInstance: AttributeSpec<"float32">;
     aTransform: AttributeSpec<"float32">;
-    uAlpha: import("./schema").UniformSpec<"f">;
-    uMetalness: import("./schema").UniformSpec<"f">;
-    uRoughness: import("./schema").UniformSpec<"f">;
-    uVertexCount: import("./schema").UniformSpec<"i">;
-    uInstanceCount: import("./schema").UniformSpec<"i">;
-    uGroupCount: import("./schema").UniformSpec<"i">;
-    uInvariantBoundingSphere: import("./schema").UniformSpec<"v4">;
+    uAlpha: UniformSpec<"f">;
+    uMetalness: UniformSpec<"f">;
+    uRoughness: UniformSpec<"f">;
+    uBumpiness: UniformSpec<"f">;
+    uVertexCount: UniformSpec<"i">;
+    uInstanceCount: UniformSpec<"i">;
+    uGroupCount: UniformSpec<"i">;
+    uInvariantBoundingSphere: UniformSpec<"v4">;
     drawCount: ValueSpec<"number">;
     instanceCount: ValueSpec<"number">;
     alpha: ValueSpec<"number">;
@@ -42,43 +53,40 @@ export declare const CylindersSchema: {
     hasReflection: ValueSpec<"boolean">;
     boundingSphere: ValueSpec<"sphere">;
     invariantBoundingSphere: ValueSpec<"sphere">;
-    dClipObjectCount: DefineSpec<"number">;
-    dClipVariant: DefineSpec<"string">;
-    uClippingTexDim: import("./schema").UniformSpec<"v2">;
+    uClippingTexDim: UniformSpec<"v2">;
     tClipping: import("./schema").TextureSpec<"image-uint8">;
     dClipping: DefineSpec<"boolean">;
-    uSubstanceTexDim: import("./schema").UniformSpec<"v2">;
+    uSubstanceTexDim: UniformSpec<"v2">;
     tSubstance: import("./schema").TextureSpec<"image-uint8">;
     dSubstance: DefineSpec<"boolean">;
-    uSubstanceGridDim: import("./schema").UniformSpec<"v3">;
-    uSubstanceGridTransform: import("./schema").UniformSpec<"v4">;
+    uSubstanceGridDim: UniformSpec<"v3">;
+    uSubstanceGridTransform: UniformSpec<"v4">;
     tSubstanceGrid: import("./schema").TextureSpec<"texture">;
     dSubstanceType: DefineSpec<"string">;
-    uTransparencyTexDim: import("./schema").UniformSpec<"v2">;
+    uTransparencyTexDim: UniformSpec<"v2">;
     tTransparency: import("./schema").TextureSpec<"image-uint8">;
     dTransparency: DefineSpec<"boolean">;
     transparencyAverage: ValueSpec<"number">;
-    uTransparencyGridDim: import("./schema").UniformSpec<"v3">;
-    uTransparencyGridTransform: import("./schema").UniformSpec<"v4">;
+    uTransparencyGridDim: UniformSpec<"v3">;
+    uTransparencyGridTransform: UniformSpec<"v4">;
     tTransparencyGrid: import("./schema").TextureSpec<"texture">;
     dTransparencyType: DefineSpec<"string">;
-    uOverpaintTexDim: import("./schema").UniformSpec<"v2">;
+    uOverpaintTexDim: UniformSpec<"v2">;
     tOverpaint: import("./schema").TextureSpec<"image-uint8">;
     dOverpaint: DefineSpec<"boolean">;
-    uOverpaintGridDim: import("./schema").UniformSpec<"v3">;
-    uOverpaintGridTransform: import("./schema").UniformSpec<"v4">;
+    uOverpaintGridDim: UniformSpec<"v3">;
+    uOverpaintGridTransform: UniformSpec<"v4">;
     tOverpaintGrid: import("./schema").TextureSpec<"texture">;
     dOverpaintType: DefineSpec<"string">;
-    uMarker: import("./schema").UniformSpec<"f">;
-    uMarkerTexDim: import("./schema").UniformSpec<"v2">;
+    uMarker: UniformSpec<"f">;
+    uMarkerTexDim: UniformSpec<"v2">;
     tMarker: import("./schema").TextureSpec<"image-uint8">;
-    dMarkerType: DefineSpec<"string">;
     markerAverage: ValueSpec<"number">;
     markerStatus: ValueSpec<"number">;
-    uColor: import("./schema").UniformSpec<"v3">;
-    uColorTexDim: import("./schema").UniformSpec<"v2">;
-    uColorGridDim: import("./schema").UniformSpec<"v3">;
-    uColorGridTransform: import("./schema").UniformSpec<"v4">;
+    uColor: UniformSpec<"v3">;
+    uColorTexDim: UniformSpec<"v2">;
+    uColorGridDim: UniformSpec<"v3">;
+    uColorGridTransform: UniformSpec<"v4">;
     tColor: import("./schema").TextureSpec<"image-uint8">;
     tPalette: import("./schema").TextureSpec<"image-uint8">;
     tColorGrid: import("./schema").TextureSpec<"texture">;
@@ -87,4 +95,4 @@ export declare const CylindersSchema: {
 };
 export declare type CylindersSchema = typeof CylindersSchema;
 export declare type CylindersValues = Values<CylindersSchema>;
-export declare function CylindersRenderable(ctx: WebGLContext, id: number, values: CylindersValues, state: RenderableState, materialId: number): Renderable<CylindersValues>;
+export declare function CylindersRenderable(ctx: WebGLContext, id: number, values: CylindersValues, state: RenderableState, materialId: number, variants: GraphicsRenderVariant[]): Renderable<CylindersValues>;

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

@@ -1,22 +1,22 @@
 /**
- * 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>
  */
 import { __assign } from "tslib";
 import { createRenderable } from '../renderable';
 import { createGraphicsRenderItem } from '../webgl/render-item';
-import { GlobalUniformSchema, BaseSchema, AttributeSpec, InternalSchema, SizeSchema, ElementsSpec, ValueSpec, DefineSpec, GlobalTextureSchema } from './schema';
+import { GlobalUniformSchema, BaseSchema, AttributeSpec, InternalSchema, SizeSchema, ElementsSpec, ValueSpec, DefineSpec, GlobalTextureSchema, UniformSpec } from './schema';
 import { CylindersShaderCode } from '../shader-code';
 import { ValueCell } from '../../mol-util';
-export var CylindersSchema = __assign(__assign(__assign({}, BaseSchema), SizeSchema), { aGroup: AttributeSpec('float32', 1, 0), aStart: AttributeSpec('float32', 3, 0), aEnd: AttributeSpec('float32', 3, 0), aMapping: AttributeSpec('float32', 3, 0), aScale: AttributeSpec('float32', 1, 0), aCap: AttributeSpec('float32', 1, 0), elements: ElementsSpec('uint32'), padding: ValueSpec('number'), dDoubleSided: DefineSpec('boolean'), dIgnoreLight: DefineSpec('boolean'), dXrayShaded: DefineSpec('boolean') });
-export function CylindersRenderable(ctx, id, values, state, materialId) {
+export var CylindersSchema = __assign(__assign(__assign({}, BaseSchema), SizeSchema), { aGroup: AttributeSpec('float32', 1, 0), aStart: AttributeSpec('float32', 3, 0), aEnd: AttributeSpec('float32', 3, 0), aMapping: AttributeSpec('float32', 3, 0), aScale: AttributeSpec('float32', 1, 0), aCap: AttributeSpec('float32', 1, 0), elements: ElementsSpec('uint32'), padding: ValueSpec('number'), uDoubleSided: UniformSpec('b'), dIgnoreLight: DefineSpec('boolean'), dXrayShaded: DefineSpec('boolean'), uBumpFrequency: UniformSpec('f'), uBumpAmplitude: UniformSpec('f') });
+export function CylindersRenderable(ctx, id, values, state, materialId, variants) {
     var schema = __assign(__assign(__assign(__assign({}, GlobalUniformSchema), GlobalTextureSchema), InternalSchema), CylindersSchema);
     var internalValues = {
         uObjectId: ValueCell.create(id),
     };
     var shaderCode = CylindersShaderCode;
-    var renderItem = createGraphicsRenderItem(ctx, 'triangles', shaderCode, schema, __assign(__assign({}, values), internalValues), materialId);
+    var renderItem = createGraphicsRenderItem(ctx, 'triangles', shaderCode, schema, __assign(__assign({}, values), internalValues), materialId, variants);
     return createRenderable(renderItem, values, state);
 }
 //# sourceMappingURL=cylinders.js.map

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

@@ -5,6 +5,7 @@
  */
 import { Renderable, RenderableState } from '../renderable';
 import { WebGLContext } from '../webgl/context';
+import { GraphicsRenderVariant } from '../webgl/render-item';
 import { AttributeSpec, Values, UniformSpec, TextureSpec, ElementsSpec, DefineSpec } from './schema';
 export declare const DirectVolumeSchema: {
     aPosition: AttributeSpec<"float32">;
@@ -34,17 +35,25 @@ export declare const DirectVolumeSchema: {
     uCartnToUnit: UniformSpec<"m4">;
     uUnitToCartn: UniformSpec<"m4">;
     dPackedGroup: DefineSpec<"boolean">;
-    dDoubleSided: DefineSpec<"boolean">;
+    uDoubleSided: UniformSpec<"b">;
     dFlipSided: DefineSpec<"boolean">;
     dFlatShaded: DefineSpec<"boolean">;
     dIgnoreLight: DefineSpec<"boolean">;
     dXrayShaded: DefineSpec<"boolean">;
     dLightCount: DefineSpec<"number">;
+    dClipObjectCount: DefineSpec<"number">;
+    dClipVariant: DefineSpec<"string">;
+    uClipObjectType: UniformSpec<"i[]">;
+    uClipObjectInvert: UniformSpec<"b[]">;
+    uClipObjectPosition: UniformSpec<"v3[]">;
+    uClipObjectRotation: UniformSpec<"v4[]">;
+    uClipObjectScale: UniformSpec<"v3[]">;
     aInstance: AttributeSpec<"float32">;
     aTransform: AttributeSpec<"float32">;
     uAlpha: UniformSpec<"f">;
     uMetalness: UniformSpec<"f">;
     uRoughness: UniformSpec<"f">;
+    uBumpiness: UniformSpec<"f">;
     uVertexCount: UniformSpec<"i">;
     uInstanceCount: UniformSpec<"i">;
     uGroupCount: UniformSpec<"i">;
@@ -58,8 +67,6 @@ export declare const DirectVolumeSchema: {
     hasReflection: import("./schema").ValueSpec<"boolean">;
     boundingSphere: import("./schema").ValueSpec<"sphere">;
     invariantBoundingSphere: import("./schema").ValueSpec<"sphere">;
-    dClipObjectCount: DefineSpec<"number">;
-    dClipVariant: DefineSpec<"string">;
     uClippingTexDim: UniformSpec<"v2">;
     tClipping: TextureSpec<"image-uint8">;
     dClipping: DefineSpec<"boolean">;
@@ -88,7 +95,6 @@ export declare const DirectVolumeSchema: {
     uMarker: UniformSpec<"f">;
     uMarkerTexDim: UniformSpec<"v2">;
     tMarker: TextureSpec<"image-uint8">;
-    dMarkerType: DefineSpec<"string">;
     markerAverage: import("./schema").ValueSpec<"number">;
     markerStatus: import("./schema").ValueSpec<"number">;
     uColorGridDim: UniformSpec<"v3">;
@@ -99,4 +105,4 @@ export declare const DirectVolumeSchema: {
 };
 export declare type DirectVolumeSchema = typeof DirectVolumeSchema;
 export declare type DirectVolumeValues = Values<DirectVolumeSchema>;
-export declare function DirectVolumeRenderable(ctx: WebGLContext, id: number, values: DirectVolumeValues, state: RenderableState, materialId: number): Renderable<DirectVolumeValues>;
+export declare function DirectVolumeRenderable(ctx: WebGLContext, id: number, values: DirectVolumeValues, state: RenderableState, materialId: number, variants: GraphicsRenderVariant[]): Renderable<DirectVolumeValues>;

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

@@ -9,8 +9,8 @@ import { createGraphicsRenderItem } from '../webgl/render-item';
 import { AttributeSpec, UniformSpec, GlobalUniformSchema, InternalSchema, TextureSpec, ElementsSpec, DefineSpec, GlobalTextureSchema, BaseSchema } from './schema';
 import { DirectVolumeShaderCode } from '../shader-code';
 import { ValueCell } from '../../mol-util';
-export var DirectVolumeSchema = __assign(__assign({}, BaseSchema), { aPosition: AttributeSpec('float32', 3, 0), elements: ElementsSpec('uint32'), uColor: UniformSpec('v3'), uColorTexDim: UniformSpec('v2'), tColor: TextureSpec('image-uint8', 'rgb', 'ubyte', 'nearest'), dColorType: DefineSpec('string', ['uniform', 'attribute', 'instance', 'group', 'groupInstance', 'vertex', 'vertexInstance']), uIsoValue: UniformSpec('v2'), uBboxMin: UniformSpec('v3'), uBboxMax: UniformSpec('v3'), uBboxSize: UniformSpec('v3'), uMaxSteps: UniformSpec('i'), uStepScale: UniformSpec('f'), uJumpLength: UniformSpec('f'), uTransform: UniformSpec('m4'), uGridDim: UniformSpec('v3'), dRenderMode: DefineSpec('string', ['isosurface', 'volume']), dSingleLayer: DefineSpec('boolean'), tTransferTex: TextureSpec('image-uint8', 'rgba', 'ubyte', 'linear'), uTransferScale: UniformSpec('f'), dGridTexType: DefineSpec('string', ['2d', '3d']), uGridTexDim: UniformSpec('v3'), tGridTex: TextureSpec('texture', 'rgba', 'ubyte', 'linear'), uGridStats: UniformSpec('v4'), uCellDim: UniformSpec('v3'), uCartnToUnit: UniformSpec('m4'), uUnitToCartn: UniformSpec('m4'), dPackedGroup: DefineSpec('boolean'), dDoubleSided: DefineSpec('boolean'), dFlipSided: DefineSpec('boolean'), dFlatShaded: DefineSpec('boolean'), dIgnoreLight: DefineSpec('boolean'), dXrayShaded: DefineSpec('boolean') });
-export function DirectVolumeRenderable(ctx, id, values, state, materialId) {
+export var DirectVolumeSchema = __assign(__assign({}, BaseSchema), { aPosition: AttributeSpec('float32', 3, 0), elements: ElementsSpec('uint32'), uColor: UniformSpec('v3'), uColorTexDim: UniformSpec('v2'), tColor: TextureSpec('image-uint8', 'rgb', 'ubyte', 'nearest'), dColorType: DefineSpec('string', ['uniform', 'attribute', 'instance', 'group', 'groupInstance', 'vertex', 'vertexInstance']), uIsoValue: UniformSpec('v2'), uBboxMin: UniformSpec('v3'), uBboxMax: UniformSpec('v3'), uBboxSize: UniformSpec('v3'), uMaxSteps: UniformSpec('i'), uStepScale: UniformSpec('f'), uJumpLength: UniformSpec('f'), uTransform: UniformSpec('m4'), uGridDim: UniformSpec('v3'), dRenderMode: DefineSpec('string', ['isosurface', 'volume']), dSingleLayer: DefineSpec('boolean'), tTransferTex: TextureSpec('image-uint8', 'rgba', 'ubyte', 'linear'), uTransferScale: UniformSpec('f'), dGridTexType: DefineSpec('string', ['2d', '3d']), uGridTexDim: UniformSpec('v3'), tGridTex: TextureSpec('texture', 'rgba', 'ubyte', 'linear'), uGridStats: UniformSpec('v4'), uCellDim: UniformSpec('v3'), uCartnToUnit: UniformSpec('m4'), uUnitToCartn: UniformSpec('m4'), dPackedGroup: DefineSpec('boolean'), uDoubleSided: UniformSpec('b'), dFlipSided: DefineSpec('boolean'), dFlatShaded: DefineSpec('boolean'), dIgnoreLight: DefineSpec('boolean'), dXrayShaded: DefineSpec('boolean') });
+export function DirectVolumeRenderable(ctx, id, values, state, materialId, variants) {
     var schema = __assign(__assign(__assign(__assign({}, GlobalUniformSchema), GlobalTextureSchema), InternalSchema), DirectVolumeSchema);
     if (!ctx.isWebGL2) {
         // workaround for webgl1 limitation that loop counters need to be `const`
@@ -20,7 +20,7 @@ export function DirectVolumeRenderable(ctx, id, values, state, materialId) {
         uObjectId: ValueCell.create(id),
     };
     var shaderCode = DirectVolumeShaderCode;
-    var renderItem = createGraphicsRenderItem(ctx, 'triangles', shaderCode, schema, __assign(__assign({}, values), internalValues), materialId);
+    var renderItem = createGraphicsRenderItem(ctx, 'triangles', shaderCode, schema, __assign(__assign({}, values), internalValues), materialId, variants);
     return createRenderable(renderItem, values, state);
 }
 //# sourceMappingURL=direct-volume.js.map

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

@@ -5,6 +5,7 @@
  */
 import { Renderable, RenderableState } from '../renderable';
 import { WebGLContext } from '../webgl/context';
+import { GraphicsRenderVariant } from '../webgl/render-item';
 import { AttributeSpec, Values, TextureSpec, ElementsSpec, DefineSpec, UniformSpec } from './schema';
 export declare const ImageSchema: {
     aGroup: AttributeSpec<"float32">;
@@ -16,11 +17,19 @@ export declare const ImageSchema: {
     tGroupTex: TextureSpec<"image-uint8">;
     dInterpolation: DefineSpec<"string">;
     dLightCount: DefineSpec<"number">;
+    dClipObjectCount: DefineSpec<"number">;
+    dClipVariant: DefineSpec<"string">;
+    uClipObjectType: UniformSpec<"i[]">;
+    uClipObjectInvert: UniformSpec<"b[]">;
+    uClipObjectPosition: UniformSpec<"v3[]">;
+    uClipObjectRotation: UniformSpec<"v4[]">;
+    uClipObjectScale: UniformSpec<"v3[]">;
     aInstance: AttributeSpec<"float32">;
     aTransform: AttributeSpec<"float32">;
     uAlpha: UniformSpec<"f">;
     uMetalness: UniformSpec<"f">;
     uRoughness: UniformSpec<"f">;
+    uBumpiness: UniformSpec<"f">;
     uVertexCount: UniformSpec<"i">;
     uInstanceCount: UniformSpec<"i">;
     uGroupCount: UniformSpec<"i">;
@@ -34,8 +43,6 @@ export declare const ImageSchema: {
     hasReflection: import("./schema").ValueSpec<"boolean">;
     boundingSphere: import("./schema").ValueSpec<"sphere">;
     invariantBoundingSphere: import("./schema").ValueSpec<"sphere">;
-    dClipObjectCount: DefineSpec<"number">;
-    dClipVariant: DefineSpec<"string">;
     uClippingTexDim: UniformSpec<"v2">;
     tClipping: TextureSpec<"image-uint8">;
     dClipping: DefineSpec<"boolean">;
@@ -64,7 +71,6 @@ export declare const ImageSchema: {
     uMarker: UniformSpec<"f">;
     uMarkerTexDim: UniformSpec<"v2">;
     tMarker: TextureSpec<"image-uint8">;
-    dMarkerType: DefineSpec<"string">;
     markerAverage: import("./schema").ValueSpec<"number">;
     markerStatus: import("./schema").ValueSpec<"number">;
     uColor: UniformSpec<"v3">;
@@ -79,4 +85,4 @@ export declare const ImageSchema: {
 };
 export declare type ImageSchema = typeof ImageSchema;
 export declare type ImageValues = Values<ImageSchema>;
-export declare function ImageRenderable(ctx: WebGLContext, id: number, values: ImageValues, state: RenderableState, materialId: number): Renderable<ImageValues>;
+export declare function ImageRenderable(ctx: WebGLContext, id: number, values: ImageValues, state: RenderableState, materialId: number, variants: GraphicsRenderVariant[]): Renderable<ImageValues>;

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

@@ -11,13 +11,13 @@ import { ImageShaderCode } from '../shader-code';
 import { ValueCell } from '../../mol-util';
 import { InterpolationTypeNames } from '../../mol-geo/geometry/image/image';
 export var ImageSchema = __assign(__assign({}, BaseSchema), { aGroup: AttributeSpec('float32', 1, 0), aPosition: AttributeSpec('float32', 3, 0), aUv: AttributeSpec('float32', 2, 0), elements: ElementsSpec('uint32'), uImageTexDim: UniformSpec('v2'), tImageTex: TextureSpec('image-uint8', 'rgba', 'ubyte', 'nearest'), tGroupTex: TextureSpec('image-uint8', 'rgba', 'ubyte', 'nearest'), dInterpolation: DefineSpec('string', InterpolationTypeNames) });
-export function ImageRenderable(ctx, id, values, state, materialId) {
+export function ImageRenderable(ctx, id, values, state, materialId, variants) {
     var schema = __assign(__assign(__assign(__assign({}, GlobalUniformSchema), GlobalTextureSchema), InternalSchema), ImageSchema);
     var internalValues = {
         uObjectId: ValueCell.create(id),
     };
     var shaderCode = ImageShaderCode;
-    var renderItem = createGraphicsRenderItem(ctx, 'triangles', shaderCode, schema, __assign(__assign({}, values), internalValues), materialId);
+    var renderItem = createGraphicsRenderItem(ctx, 'triangles', shaderCode, schema, __assign(__assign({}, values), internalValues), materialId, variants);
     return createRenderable(renderItem, values, state);
 }
 //# sourceMappingURL=image.js.map