molstar 3.0.0-dev.6 → 3.0.0

package/lib/mol-gl/compute/marching-cubes/isosurface.d.ts

@@ -7,7 +7,7 @@ import { WebGLContext } from '../../webgl/context';
 import { Texture } from '../../../mol-gl/webgl/texture';
 import { Vec3, Vec2, Mat4 } from '../../../mol-math/linear-algebra';
 import { HistogramPyramid } from '../histogram-pyramid/reduction';
-export declare function createIsosurfaceBuffers(ctx: WebGLContext, activeVoxelsBase: Texture, volumeData: Texture, histogramPyramid: HistogramPyramid, gridDim: Vec3, gridTexDim: Vec3, transform: Mat4, isoValue: number, invert: boolean, packedGroup: boolean, vertexTexture?: Texture, groupTexture?: Texture, normalTexture?: Texture): {
+export declare function createIsosurfaceBuffers(ctx: WebGLContext, activeVoxelsBase: Texture, volumeData: Texture, histogramPyramid: HistogramPyramid, gridDim: Vec3, gridTexDim: Vec3, transform: Mat4, isoValue: number, invert: boolean, packedGroup: boolean, axisOrder: Vec3, vertexTexture?: Texture, groupTexture?: Texture, normalTexture?: Texture): {
     vertexTexture: Texture;
     groupTexture: Texture;
     normalTexture: Texture;
@@ -22,7 +22,7 @@ export declare function createIsosurfaceBuffers(ctx: WebGLContext, activeVoxelsB
  *
  * Implementation based on http://www.miaumiau.cat/2016/10/stream-compaction-in-webgl/
  */
-export declare function extractIsosurface(ctx: WebGLContext, volumeData: Texture, gridDim: Vec3, gridTexDim: Vec3, gridTexScale: Vec2, transform: Mat4, isoValue: number, invert: boolean, packedGroup: boolean, vertexTexture?: Texture, groupTexture?: Texture, normalTexture?: Texture): {
+export declare function extractIsosurface(ctx: WebGLContext, volumeData: Texture, gridDim: Vec3, gridTexDim: Vec3, gridTexScale: Vec2, transform: Mat4, isoValue: number, invert: boolean, packedGroup: boolean, axisOrder: Vec3, vertexTexture?: Texture, groupTexture?: Texture, normalTexture?: Texture): {
     vertexTexture: Texture;
     groupTexture: Texture;
     normalTexture: Texture;

package/lib/mol-gl/compute/marching-cubes/isosurface.js

@@ -16,9 +16,9 @@ import { quad_vert } from '../../../mol-gl/shader/quad.vert';
 import { isosurface_frag } from '../../../mol-gl/shader/marching-cubes/isosurface.frag';
 import { calcActiveVoxels } from './active-voxels';
 import { isWebGL2 } from '../../webgl/compat';
-var IsosurfaceSchema = __assign(__assign({}, QuadSchema), { tTriIndices: TextureSpec('image-uint8', 'alpha', 'ubyte', 'nearest'), tActiveVoxelsPyramid: TextureSpec('texture', 'rgba', 'float', 'nearest'), tActiveVoxelsBase: TextureSpec('texture', 'rgba', 'float', 'nearest'), tVolumeData: TextureSpec('texture', 'rgba', 'ubyte', 'nearest'), uIsoValue: UniformSpec('f'), uSize: UniformSpec('f'), uLevels: UniformSpec('f'), uCount: UniformSpec('f'), uInvert: UniformSpec('b'), uGridDim: UniformSpec('v3'), uGridTexDim: UniformSpec('v3'), uGridTransform: UniformSpec('m4'), uScale: UniformSpec('v2'), dPackedGroup: DefineSpec('boolean') });
+var IsosurfaceSchema = __assign(__assign({}, QuadSchema), { tTriIndices: TextureSpec('image-uint8', 'alpha', 'ubyte', 'nearest'), tActiveVoxelsPyramid: TextureSpec('texture', 'rgba', 'float', 'nearest'), tActiveVoxelsBase: TextureSpec('texture', 'rgba', 'float', 'nearest'), tVolumeData: TextureSpec('texture', 'rgba', 'ubyte', 'nearest'), uIsoValue: UniformSpec('f'), uSize: UniformSpec('f'), uLevels: UniformSpec('f'), uCount: UniformSpec('f'), uInvert: UniformSpec('b'), uGridDim: UniformSpec('v3'), uGridTexDim: UniformSpec('v3'), uGridTransform: UniformSpec('m4'), uScale: UniformSpec('v2'), dPackedGroup: DefineSpec('boolean'), dAxisOrder: DefineSpec('string', ['012', '021', '102', '120', '201', '210']) });
 var IsosurfaceName = 'isosurface';
-function getIsosurfaceRenderable(ctx, activeVoxelsPyramid, activeVoxelsBase, volumeData, gridDim, gridTexDim, transform, isoValue, levels, scale, count, invert, packedGroup) {
+function getIsosurfaceRenderable(ctx, activeVoxelsPyramid, activeVoxelsBase, volumeData, gridDim, gridTexDim, transform, isoValue, levels, scale, count, invert, packedGroup, axisOrder) {
     if (ctx.namedComputeRenderables[IsosurfaceName]) {
         var v = ctx.namedComputeRenderables[IsosurfaceName].values;
         ValueCell.update(v.tActiveVoxelsPyramid, activeVoxelsPyramid);
@@ -34,16 +34,17 @@ function getIsosurfaceRenderable(ctx, activeVoxelsPyramid, activeVoxelsBase, vol
         ValueCell.update(v.uGridTransform, transform);
         ValueCell.update(v.uScale, scale);
         ValueCell.update(v.dPackedGroup, packedGroup);
+        ValueCell.updateIfChanged(v.dAxisOrder, axisOrder.join(''));
         ctx.namedComputeRenderables[IsosurfaceName].update();
     }
     else {
-        ctx.namedComputeRenderables[IsosurfaceName] = createIsosurfaceRenderable(ctx, activeVoxelsPyramid, activeVoxelsBase, volumeData, gridDim, gridTexDim, transform, isoValue, levels, scale, count, invert, packedGroup);
+        ctx.namedComputeRenderables[IsosurfaceName] = createIsosurfaceRenderable(ctx, activeVoxelsPyramid, activeVoxelsBase, volumeData, gridDim, gridTexDim, transform, isoValue, levels, scale, count, invert, packedGroup, axisOrder);
     }
     return ctx.namedComputeRenderables[IsosurfaceName];
 }
-function createIsosurfaceRenderable(ctx, activeVoxelsPyramid, activeVoxelsBase, volumeData, gridDim, gridTexDim, transform, isoValue, levels, scale, count, invert, packedGroup) {
+function createIsosurfaceRenderable(ctx, activeVoxelsPyramid, activeVoxelsBase, volumeData, gridDim, gridTexDim, transform, isoValue, levels, scale, count, invert, packedGroup, axisOrder) {
     // console.log('uSize', Math.pow(2, levels))
-    var values = __assign(__assign({}, QuadValues), { tTriIndices: ValueCell.create(getTriIndices()), tActiveVoxelsPyramid: ValueCell.create(activeVoxelsPyramid), tActiveVoxelsBase: ValueCell.create(activeVoxelsBase), tVolumeData: ValueCell.create(volumeData), uIsoValue: ValueCell.create(isoValue), uSize: ValueCell.create(Math.pow(2, levels)), uLevels: ValueCell.create(levels), uCount: ValueCell.create(count), uInvert: ValueCell.create(invert), uGridDim: ValueCell.create(gridDim), uGridTexDim: ValueCell.create(gridTexDim), uGridTransform: ValueCell.create(transform), uScale: ValueCell.create(scale), dPackedGroup: ValueCell.create(packedGroup) });
+    var values = __assign(__assign({}, QuadValues), { tTriIndices: ValueCell.create(getTriIndices()), tActiveVoxelsPyramid: ValueCell.create(activeVoxelsPyramid), tActiveVoxelsBase: ValueCell.create(activeVoxelsBase), tVolumeData: ValueCell.create(volumeData), uIsoValue: ValueCell.create(isoValue), uSize: ValueCell.create(Math.pow(2, levels)), uLevels: ValueCell.create(levels), uCount: ValueCell.create(count), uInvert: ValueCell.create(invert), uGridDim: ValueCell.create(gridDim), uGridTexDim: ValueCell.create(gridTexDim), uGridTransform: ValueCell.create(transform), uScale: ValueCell.create(scale), dPackedGroup: ValueCell.create(packedGroup), dAxisOrder: ValueCell.create(axisOrder.join('')) });
     var schema = __assign({}, IsosurfaceSchema);
     var shaderCode = ShaderCode('isosurface', quad_vert, isosurface_frag, { drawBuffers: 'required' });
     var renderItem = createComputeRenderItem(ctx, 'triangles', shaderCode, schema, values);
@@ -59,7 +60,7 @@ function setRenderingDefaults(ctx) {
     state.colorMask(true, true, true, true);
     state.clearColor(0, 0, 0, 0);
 }
-export function createIsosurfaceBuffers(ctx, activeVoxelsBase, volumeData, histogramPyramid, gridDim, gridTexDim, transform, isoValue, invert, packedGroup, vertexTexture, groupTexture, normalTexture) {
+export function createIsosurfaceBuffers(ctx, activeVoxelsBase, volumeData, histogramPyramid, gridDim, gridTexDim, transform, isoValue, invert, packedGroup, axisOrder, vertexTexture, groupTexture, normalTexture) {
     var drawBuffers = ctx.extensions.drawBuffers;
     if (!drawBuffers)
         throw new Error('need WebGL draw buffers');
@@ -107,7 +108,7 @@ export function createIsosurfaceBuffers(ctx, activeVoxelsBase, volumeData, histo
     vertexTexture.attachFramebuffer(framebuffer, 0);
     groupTexture.attachFramebuffer(framebuffer, 1);
     normalTexture.attachFramebuffer(framebuffer, 2);
-    var renderable = getIsosurfaceRenderable(ctx, pyramidTex, activeVoxelsBase, volumeData, gridDim, gridTexDim, transform, isoValue, levels, scale, count, invert, packedGroup);
+    var renderable = getIsosurfaceRenderable(ctx, pyramidTex, activeVoxelsBase, volumeData, gridDim, gridTexDim, transform, isoValue, levels, scale, count, invert, packedGroup, axisOrder);
     ctx.state.currentRenderItemId = -1;
     framebuffer.bind();
     drawBuffers.drawBuffers([
@@ -132,7 +133,7 @@ export function createIsosurfaceBuffers(ctx, activeVoxelsBase, volumeData, histo
  *
  * Implementation based on http://www.miaumiau.cat/2016/10/stream-compaction-in-webgl/
  */
-export function extractIsosurface(ctx, volumeData, gridDim, gridTexDim, gridTexScale, transform, isoValue, invert, packedGroup, vertexTexture, groupTexture, normalTexture) {
+export function extractIsosurface(ctx, volumeData, gridDim, gridTexDim, gridTexScale, transform, isoValue, invert, packedGroup, axisOrder, vertexTexture, groupTexture, normalTexture) {
     // console.time('calcActiveVoxels');
     var activeVoxelsTex = calcActiveVoxels(ctx, volumeData, gridDim, gridTexDim, isoValue, gridTexScale);
     // ctx.waitForGpuCommandsCompleteSync();
@@ -142,7 +143,7 @@ export function extractIsosurface(ctx, volumeData, gridDim, gridTexDim, gridTexS
     // ctx.waitForGpuCommandsCompleteSync();
     // console.timeEnd('createHistogramPyramid');
     // console.time('createIsosurfaceBuffers');
-    var gv = createIsosurfaceBuffers(ctx, activeVoxelsTex, volumeData, compacted, gridDim, gridTexDim, transform, isoValue, invert, packedGroup, vertexTexture, groupTexture, normalTexture);
+    var gv = createIsosurfaceBuffers(ctx, activeVoxelsTex, volumeData, compacted, gridDim, gridTexDim, transform, isoValue, invert, packedGroup, axisOrder, vertexTexture, groupTexture, normalTexture);
     // ctx.waitForGpuCommandsCompleteSync();
     // console.timeEnd('createIsosurfaceBuffers');
     return gv;

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

@@ -5,6 +5,7 @@
  */
 import { Renderable, RenderableState } from '../renderable';
 import { WebGLContext } from '../webgl/context';
+import { GraphicsRenderVariant } from '../webgl/render-item';
 import { AttributeSpec, Values, ElementsSpec, ValueSpec, DefineSpec, UniformSpec } from './schema';
 export declare const CylindersSchema: {
     aGroup: AttributeSpec<"float32">;
@@ -15,7 +16,7 @@ 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">;
     uBumpFrequency: UniformSpec<"f">;
@@ -26,6 +27,13 @@ export declare const CylindersSchema: {
     dSizeType: DefineSpec<"string">;
     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: UniformSpec<"f">;
@@ -45,8 +53,6 @@ export declare const CylindersSchema: {
     hasReflection: ValueSpec<"boolean">;
     boundingSphere: ValueSpec<"sphere">;
     invariantBoundingSphere: ValueSpec<"sphere">;
-    dClipObjectCount: DefineSpec<"number">;
-    dClipVariant: DefineSpec<"string">;
     uClippingTexDim: UniformSpec<"v2">;
     tClipping: import("./schema").TextureSpec<"image-uint8">;
     dClipping: DefineSpec<"boolean">;
@@ -75,7 +81,6 @@ export declare const CylindersSchema: {
     uMarker: UniformSpec<"f">;
     uMarkerTexDim: UniformSpec<"v2">;
     tMarker: import("./schema").TextureSpec<"image-uint8">;
-    dMarkerType: DefineSpec<"string">;
     markerAverage: ValueSpec<"number">;
     markerStatus: ValueSpec<"number">;
     uColor: UniformSpec<"v3">;
@@ -87,7 +92,8 @@ export declare const CylindersSchema: {
     tColorGrid: import("./schema").TextureSpec<"texture">;
     dColorType: DefineSpec<"string">;
     dUsePalette: DefineSpec<"boolean">;
+    dGeometryType: DefineSpec<"string">;
 };
 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

@@ -9,14 +9,14 @@ import { createGraphicsRenderItem } from '../webgl/render-item';
 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'), uBumpFrequency: UniformSpec('f'), uBumpAmplitude: UniformSpec('f') });
-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,15 +5,11 @@
  */
 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">;
     elements: ElementsSpec<"uint32">;
-    uColor: UniformSpec<"v3">;
-    uColorTexDim: UniformSpec<"v2">;
-    tColor: TextureSpec<"image-uint8">;
-    dColorType: DefineSpec<"string">;
-    uIsoValue: UniformSpec<"v2">;
     uBboxMin: UniformSpec<"v3">;
     uBboxMax: UniformSpec<"v3">;
     uBboxSize: UniformSpec<"v3">;
@@ -22,8 +18,6 @@ export declare const DirectVolumeSchema: {
     uJumpLength: UniformSpec<"f">;
     uTransform: UniformSpec<"m4">;
     uGridDim: UniformSpec<"v3">;
-    dRenderMode: DefineSpec<"string">;
-    dSingleLayer: DefineSpec<"boolean">;
     tTransferTex: TextureSpec<"image-uint8">;
     uTransferScale: UniformSpec<"f">;
     dGridTexType: DefineSpec<"string">;
@@ -34,12 +28,17 @@ export declare const DirectVolumeSchema: {
     uCartnToUnit: UniformSpec<"m4">;
     uUnitToCartn: UniformSpec<"m4">;
     dPackedGroup: DefineSpec<"boolean">;
-    dDoubleSided: DefineSpec<"boolean">;
-    dFlipSided: DefineSpec<"boolean">;
-    dFlatShaded: DefineSpec<"boolean">;
+    dAxisOrder: DefineSpec<"string">;
     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">;
@@ -59,8 +58,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">;
@@ -89,15 +86,19 @@ 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">;
+    uColor: UniformSpec<"v3">;
+    uColorTexDim: UniformSpec<"v2">;
     uColorGridDim: UniformSpec<"v3">;
     uColorGridTransform: UniformSpec<"v4">;
+    tColor: TextureSpec<"image-uint8">;
     tPalette: TextureSpec<"image-uint8">;
     tColorGrid: TextureSpec<"texture">;
+    dColorType: DefineSpec<"string">;
     dUsePalette: DefineSpec<"boolean">;
+    dGeometryType: DefineSpec<"string">;
 };
 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'), uBboxMin: UniformSpec('v3'), uBboxMax: UniformSpec('v3'), uBboxSize: UniformSpec('v3'), uMaxSteps: UniformSpec('i'), uStepScale: UniformSpec('f'), uJumpLength: UniformSpec('f'), uTransform: UniformSpec('m4'), uGridDim: UniformSpec('v3'), tTransferTex: TextureSpec('image-uint8', 'alpha', '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'), dAxisOrder: DefineSpec('string', ['012', '021', '102', '120', '201', '210']), 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,6 +17,13 @@ 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">;
@@ -35,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">;
@@ -65,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">;
@@ -77,7 +82,8 @@ export declare const ImageSchema: {
     tColorGrid: TextureSpec<"texture">;
     dColorType: DefineSpec<"string">;
     dUsePalette: DefineSpec<"boolean">;
+    dGeometryType: DefineSpec<"string">;
 };
 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

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

@@ -5,7 +5,8 @@
  */
 import { Renderable, RenderableState } from '../renderable';
 import { WebGLContext } from '../webgl/context';
-import { AttributeSpec, DefineSpec, Values, ElementsSpec } from './schema';
+import { GraphicsRenderVariant } from '../webgl/render-item';
+import { AttributeSpec, DefineSpec, Values, ElementsSpec, UniformSpec } from './schema';
 export declare const LinesSchema: {
     aGroup: AttributeSpec<"float32">;
     aMapping: AttributeSpec<"float32">;
@@ -13,24 +14,31 @@ export declare const LinesSchema: {
     aEnd: AttributeSpec<"float32">;
     elements: ElementsSpec<"uint32">;
     dLineSizeAttenuation: DefineSpec<"boolean">;
-    dDoubleSided: DefineSpec<"boolean">;
+    uDoubleSided: UniformSpec<"b">;
     dFlipSided: DefineSpec<"boolean">;
-    uSize: import("./schema").UniformSpec<"f">;
-    uSizeTexDim: import("./schema").UniformSpec<"v2">;
+    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">;
-    uBumpiness: 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: import("./schema").ValueSpec<"number">;
     instanceCount: import("./schema").ValueSpec<"number">;
     alpha: import("./schema").ValueSpec<"number">;
@@ -40,49 +48,47 @@ export declare const LinesSchema: {
     hasReflection: import("./schema").ValueSpec<"boolean">;
     boundingSphere: import("./schema").ValueSpec<"sphere">;
     invariantBoundingSphere: import("./schema").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: import("./schema").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: import("./schema").ValueSpec<"number">;
     markerStatus: import("./schema").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">;
     dColorType: DefineSpec<"string">;
     dUsePalette: DefineSpec<"boolean">;
+    dGeometryType: DefineSpec<"string">;
 };
 export declare type LinesSchema = typeof LinesSchema;
 export declare type LinesValues = Values<LinesSchema>;
-export declare function LinesRenderable(ctx: WebGLContext, id: number, values: LinesValues, state: RenderableState, materialId: number): Renderable<LinesValues>;
+export declare function LinesRenderable(ctx: WebGLContext, id: number, values: LinesValues, state: RenderableState, materialId: number, variants: GraphicsRenderVariant[]): Renderable<LinesValues>;

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

@@ -6,17 +6,17 @@
 import { __assign } from "tslib";
 import { createRenderable } from '../renderable';
 import { createGraphicsRenderItem } from '../webgl/render-item';
-import { GlobalUniformSchema, BaseSchema, AttributeSpec, DefineSpec, InternalSchema, SizeSchema, ElementsSpec, GlobalTextureSchema } from './schema';
+import { GlobalUniformSchema, BaseSchema, AttributeSpec, DefineSpec, InternalSchema, SizeSchema, ElementsSpec, GlobalTextureSchema, UniformSpec } from './schema';
 import { ValueCell } from '../../mol-util';
 import { LinesShaderCode } from '../shader-code';
-export var LinesSchema = __assign(__assign(__assign({}, BaseSchema), SizeSchema), { aGroup: AttributeSpec('float32', 1, 0), aMapping: AttributeSpec('float32', 2, 0), aStart: AttributeSpec('float32', 3, 0), aEnd: AttributeSpec('float32', 3, 0), elements: ElementsSpec('uint32'), dLineSizeAttenuation: DefineSpec('boolean'), dDoubleSided: DefineSpec('boolean'), dFlipSided: DefineSpec('boolean') });
-export function LinesRenderable(ctx, id, values, state, materialId) {
+export var LinesSchema = __assign(__assign(__assign({}, BaseSchema), SizeSchema), { aGroup: AttributeSpec('float32', 1, 0), aMapping: AttributeSpec('float32', 2, 0), aStart: AttributeSpec('float32', 3, 0), aEnd: AttributeSpec('float32', 3, 0), elements: ElementsSpec('uint32'), dLineSizeAttenuation: DefineSpec('boolean'), uDoubleSided: UniformSpec('b'), dFlipSided: DefineSpec('boolean') });
+export function LinesRenderable(ctx, id, values, state, materialId, variants) {
     var schema = __assign(__assign(__assign(__assign({}, GlobalUniformSchema), GlobalTextureSchema), InternalSchema), LinesSchema);
     var internalValues = {
         uObjectId: ValueCell.create(id),
     };
     var shaderCode = LinesShaderCode;
-    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=lines.js.map

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

@@ -5,6 +5,7 @@
  */
 import { Renderable, RenderableState } from '../renderable';
 import { WebGLContext } from '../webgl/context';
+import { GraphicsRenderVariant } from '../webgl/render-item';
 import { AttributeSpec, ElementsSpec, DefineSpec, Values, ValueSpec, UniformSpec } from './schema';
 export declare const MeshSchema: {
     readonly aGroup: AttributeSpec<"float32">;
@@ -12,7 +13,7 @@ export declare const MeshSchema: {
     readonly aNormal: AttributeSpec<"float32">;
     readonly elements: ElementsSpec<"uint32">;
     readonly dFlatShaded: DefineSpec<"boolean">;
-    readonly dDoubleSided: DefineSpec<"boolean">;
+    readonly uDoubleSided: UniformSpec<"b">;
     readonly dFlipSided: DefineSpec<"boolean">;
     readonly dIgnoreLight: DefineSpec<"boolean">;
     readonly dXrayShaded: DefineSpec<"boolean">;
@@ -20,6 +21,13 @@ export declare const MeshSchema: {
     readonly uBumpAmplitude: UniformSpec<"f">;
     readonly meta: ValueSpec<"unknown">;
     readonly dLightCount: DefineSpec<"number">;
+    readonly dClipObjectCount: DefineSpec<"number">;
+    readonly dClipVariant: DefineSpec<"string">;
+    readonly uClipObjectType: UniformSpec<"i[]">;
+    readonly uClipObjectInvert: UniformSpec<"b[]">;
+    readonly uClipObjectPosition: UniformSpec<"v3[]">;
+    readonly uClipObjectRotation: UniformSpec<"v4[]">;
+    readonly uClipObjectScale: UniformSpec<"v3[]">;
     readonly aInstance: AttributeSpec<"float32">;
     readonly aTransform: AttributeSpec<"float32">;
     readonly uAlpha: UniformSpec<"f">;
@@ -39,8 +47,6 @@ export declare const MeshSchema: {
     readonly hasReflection: ValueSpec<"boolean">;
     readonly boundingSphere: ValueSpec<"sphere">;
     readonly invariantBoundingSphere: ValueSpec<"sphere">;
-    readonly dClipObjectCount: DefineSpec<"number">;
-    readonly dClipVariant: DefineSpec<"string">;
     readonly uClippingTexDim: UniformSpec<"v2">;
     readonly tClipping: import("./schema").TextureSpec<"image-uint8">;
     readonly dClipping: DefineSpec<"boolean">;
@@ -69,7 +75,6 @@ export declare const MeshSchema: {
     readonly uMarker: UniformSpec<"f">;
     readonly uMarkerTexDim: UniformSpec<"v2">;
     readonly tMarker: import("./schema").TextureSpec<"image-uint8">;
-    readonly dMarkerType: DefineSpec<"string">;
     readonly markerAverage: ValueSpec<"number">;
     readonly markerStatus: ValueSpec<"number">;
     readonly uColor: UniformSpec<"v3">;
@@ -81,7 +86,8 @@ export declare const MeshSchema: {
     readonly tColorGrid: import("./schema").TextureSpec<"texture">;
     readonly dColorType: DefineSpec<"string">;
     readonly dUsePalette: DefineSpec<"boolean">;
+    readonly dGeometryType: DefineSpec<"string">;
 };
 export declare type MeshSchema = typeof MeshSchema;
 export declare type MeshValues = Values<MeshSchema>;
-export declare function MeshRenderable(ctx: WebGLContext, id: number, values: MeshValues, state: RenderableState, materialId: number): Renderable<MeshValues>;
+export declare function MeshRenderable(ctx: WebGLContext, id: number, values: MeshValues, state: RenderableState, materialId: number, variants: GraphicsRenderVariant[]): Renderable<MeshValues>;

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

@@ -9,14 +9,14 @@ import { createGraphicsRenderItem } from '../webgl/render-item';
 import { GlobalUniformSchema, BaseSchema, AttributeSpec, ElementsSpec, DefineSpec, InternalSchema, GlobalTextureSchema, ValueSpec, UniformSpec } from './schema';
 import { MeshShaderCode } from '../shader-code';
 import { ValueCell } from '../../mol-util';
-export var MeshSchema = __assign(__assign({}, BaseSchema), { aGroup: AttributeSpec('float32', 1, 0), aPosition: AttributeSpec('float32', 3, 0), aNormal: AttributeSpec('float32', 3, 0), elements: ElementsSpec('uint32'), dFlatShaded: DefineSpec('boolean'), dDoubleSided: DefineSpec('boolean'), dFlipSided: DefineSpec('boolean'), dIgnoreLight: DefineSpec('boolean'), dXrayShaded: DefineSpec('boolean'), uBumpFrequency: UniformSpec('f'), uBumpAmplitude: UniformSpec('f'), meta: ValueSpec('unknown') });
-export function MeshRenderable(ctx, id, values, state, materialId) {
+export var MeshSchema = __assign(__assign({}, BaseSchema), { aGroup: AttributeSpec('float32', 1, 0), aPosition: AttributeSpec('float32', 3, 0), aNormal: AttributeSpec('float32', 3, 0), elements: ElementsSpec('uint32'), dFlatShaded: DefineSpec('boolean'), uDoubleSided: UniformSpec('b'), dFlipSided: DefineSpec('boolean'), dIgnoreLight: DefineSpec('boolean'), dXrayShaded: DefineSpec('boolean'), uBumpFrequency: UniformSpec('f'), uBumpAmplitude: UniformSpec('f'), meta: ValueSpec('unknown') });
+export function MeshRenderable(ctx, id, values, state, materialId, variants) {
     var schema = __assign(__assign(__assign(__assign({}, GlobalUniformSchema), GlobalTextureSchema), InternalSchema), MeshSchema);
     var internalValues = {
         uObjectId: ValueCell.create(id),
     };
     var shaderCode = MeshShaderCode;
-    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=mesh.js.map