molstar 3.0.0-dev.6 → 3.0.0-dev.7

package/lib/commonjs/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">;
@@ -80,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/commonjs/mol-gl/renderable/image.js

@@ -14,13 +14,13 @@ var shader_code_1 = require("../shader-code");
 var mol_util_1 = require("../../mol-util");
 var image_1 = require("../../mol-geo/geometry/image/image");
 exports.ImageSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.BaseSchema), { aGroup: (0, schema_1.AttributeSpec)('float32', 1, 0), aPosition: (0, schema_1.AttributeSpec)('float32', 3, 0), aUv: (0, schema_1.AttributeSpec)('float32', 2, 0), elements: (0, schema_1.ElementsSpec)('uint32'), uImageTexDim: (0, schema_1.UniformSpec)('v2'), tImageTex: (0, schema_1.TextureSpec)('image-uint8', 'rgba', 'ubyte', 'nearest'), tGroupTex: (0, schema_1.TextureSpec)('image-uint8', 'rgba', 'ubyte', 'nearest'), dInterpolation: (0, schema_1.DefineSpec)('string', image_1.InterpolationTypeNames) });
-function ImageRenderable(ctx, id, values, state, materialId) {
+function ImageRenderable(ctx, id, values, state, materialId, variants) {
     var schema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.GlobalUniformSchema), schema_1.GlobalTextureSchema), schema_1.InternalSchema), exports.ImageSchema);
     var internalValues = {
         uObjectId: mol_util_1.ValueCell.create(id),
     };
     var shaderCode = shader_code_1.ImageShaderCode;
-    var renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, values), internalValues), materialId);
+    var renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, values), internalValues), materialId, variants);
     return (0, renderable_1.createRenderable)(renderItem, values, state);
 }
 exports.ImageRenderable = ImageRenderable;

package/lib/commonjs/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,43 +48,40 @@ 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">;
@@ -85,4 +90,4 @@ export declare const LinesSchema: {
 };
 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/commonjs/mol-gl/renderable/lines.js

@@ -12,14 +12,14 @@ var render_item_1 = require("../webgl/render-item");
 var schema_1 = require("./schema");
 var mol_util_1 = require("../../mol-util");
 var shader_code_1 = require("../shader-code");
-exports.LinesSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.BaseSchema), schema_1.SizeSchema), { aGroup: (0, schema_1.AttributeSpec)('float32', 1, 0), aMapping: (0, schema_1.AttributeSpec)('float32', 2, 0), aStart: (0, schema_1.AttributeSpec)('float32', 3, 0), aEnd: (0, schema_1.AttributeSpec)('float32', 3, 0), elements: (0, schema_1.ElementsSpec)('uint32'), dLineSizeAttenuation: (0, schema_1.DefineSpec)('boolean'), dDoubleSided: (0, schema_1.DefineSpec)('boolean'), dFlipSided: (0, schema_1.DefineSpec)('boolean') });
-function LinesRenderable(ctx, id, values, state, materialId) {
+exports.LinesSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.BaseSchema), schema_1.SizeSchema), { aGroup: (0, schema_1.AttributeSpec)('float32', 1, 0), aMapping: (0, schema_1.AttributeSpec)('float32', 2, 0), aStart: (0, schema_1.AttributeSpec)('float32', 3, 0), aEnd: (0, schema_1.AttributeSpec)('float32', 3, 0), elements: (0, schema_1.ElementsSpec)('uint32'), dLineSizeAttenuation: (0, schema_1.DefineSpec)('boolean'), uDoubleSided: (0, schema_1.UniformSpec)('b'), dFlipSided: (0, schema_1.DefineSpec)('boolean') });
+function LinesRenderable(ctx, id, values, state, materialId, variants) {
     var schema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.GlobalUniformSchema), schema_1.GlobalTextureSchema), schema_1.InternalSchema), exports.LinesSchema);
     var internalValues = {
         uObjectId: mol_util_1.ValueCell.create(id),
     };
     var shaderCode = shader_code_1.LinesShaderCode;
-    var renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, values), internalValues), materialId);
+    var renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, values), internalValues), materialId, variants);
     return (0, renderable_1.createRenderable)(renderItem, values, state);
 }
 exports.LinesRenderable = LinesRenderable;

package/lib/commonjs/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">;
@@ -84,4 +89,4 @@ export declare const MeshSchema: {
 };
 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/commonjs/mol-gl/renderable/mesh.js

@@ -12,14 +12,14 @@ var render_item_1 = require("../webgl/render-item");
 var schema_1 = require("./schema");
 var shader_code_1 = require("../shader-code");
 var mol_util_1 = require("../../mol-util");
-exports.MeshSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.BaseSchema), { aGroup: (0, schema_1.AttributeSpec)('float32', 1, 0), aPosition: (0, schema_1.AttributeSpec)('float32', 3, 0), aNormal: (0, schema_1.AttributeSpec)('float32', 3, 0), elements: (0, schema_1.ElementsSpec)('uint32'), dFlatShaded: (0, schema_1.DefineSpec)('boolean'), dDoubleSided: (0, schema_1.DefineSpec)('boolean'), dFlipSided: (0, schema_1.DefineSpec)('boolean'), dIgnoreLight: (0, schema_1.DefineSpec)('boolean'), dXrayShaded: (0, schema_1.DefineSpec)('boolean'), uBumpFrequency: (0, schema_1.UniformSpec)('f'), uBumpAmplitude: (0, schema_1.UniformSpec)('f'), meta: (0, schema_1.ValueSpec)('unknown') });
-function MeshRenderable(ctx, id, values, state, materialId) {
+exports.MeshSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.BaseSchema), { aGroup: (0, schema_1.AttributeSpec)('float32', 1, 0), aPosition: (0, schema_1.AttributeSpec)('float32', 3, 0), aNormal: (0, schema_1.AttributeSpec)('float32', 3, 0), elements: (0, schema_1.ElementsSpec)('uint32'), dFlatShaded: (0, schema_1.DefineSpec)('boolean'), uDoubleSided: (0, schema_1.UniformSpec)('b'), dFlipSided: (0, schema_1.DefineSpec)('boolean'), dIgnoreLight: (0, schema_1.DefineSpec)('boolean'), dXrayShaded: (0, schema_1.DefineSpec)('boolean'), uBumpFrequency: (0, schema_1.UniformSpec)('f'), uBumpAmplitude: (0, schema_1.UniformSpec)('f'), meta: (0, schema_1.ValueSpec)('unknown') });
+function MeshRenderable(ctx, id, values, state, materialId, variants) {
     var schema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.GlobalUniformSchema), schema_1.GlobalTextureSchema), schema_1.InternalSchema), exports.MeshSchema);
     var internalValues = {
         uObjectId: mol_util_1.ValueCell.create(id),
     };
     var shaderCode = shader_code_1.MeshShaderCode;
-    var renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, values), internalValues), materialId);
+    var renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, values), internalValues), materialId, variants);
     return (0, renderable_1.createRenderable)(renderItem, values, state);
 }
 exports.MeshRenderable = MeshRenderable;

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

@@ -5,6 +5,7 @@
  */
 import { Renderable, RenderableState } from '../renderable';
 import { WebGLContext } from '../webgl/context';
+import { GraphicsRenderVariant } from '../webgl/render-item';
 import { AttributeSpec, DefineSpec, Values } from './schema';
 export declare const PointsSchema: {
     aGroup: AttributeSpec<"float32">;
@@ -17,6 +18,13 @@ export declare const PointsSchema: {
     dSizeType: DefineSpec<"string">;
     uSizeFactor: import("./schema").UniformSpec<"f">;
     dLightCount: DefineSpec<"number">;
+    dClipObjectCount: DefineSpec<"number">;
+    dClipVariant: DefineSpec<"string">;
+    uClipObjectType: import("./schema").UniformSpec<"i[]">;
+    uClipObjectInvert: import("./schema").UniformSpec<"b[]">;
+    uClipObjectPosition: import("./schema").UniformSpec<"v3[]">;
+    uClipObjectRotation: import("./schema").UniformSpec<"v4[]">;
+    uClipObjectScale: import("./schema").UniformSpec<"v3[]">;
     aInstance: AttributeSpec<"float32">;
     aTransform: AttributeSpec<"float32">;
     uAlpha: import("./schema").UniformSpec<"f">;
@@ -36,8 +44,6 @@ export declare const PointsSchema: {
     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">;
     tClipping: import("./schema").TextureSpec<"image-uint8">;
     dClipping: DefineSpec<"boolean">;
@@ -66,7 +72,6 @@ export declare const PointsSchema: {
     uMarker: import("./schema").UniformSpec<"f">;
     uMarkerTexDim: import("./schema").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">;
@@ -81,4 +86,4 @@ export declare const PointsSchema: {
 };
 export declare type PointsSchema = typeof PointsSchema;
 export declare type PointsValues = Values<PointsSchema>;
-export declare function PointsRenderable(ctx: WebGLContext, id: number, values: PointsValues, state: RenderableState, materialId: number): Renderable<PointsValues>;
+export declare function PointsRenderable(ctx: WebGLContext, id: number, values: PointsValues, state: RenderableState, materialId: number, variants: GraphicsRenderVariant[]): Renderable<PointsValues>;

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

@@ -13,13 +13,13 @@ var schema_1 = require("./schema");
 var shader_code_1 = require("../shader-code");
 var mol_util_1 = require("../../mol-util");
 exports.PointsSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.BaseSchema), schema_1.SizeSchema), { aGroup: (0, schema_1.AttributeSpec)('float32', 1, 0), aPosition: (0, schema_1.AttributeSpec)('float32', 3, 0), dPointSizeAttenuation: (0, schema_1.DefineSpec)('boolean'), dPointStyle: (0, schema_1.DefineSpec)('string', ['square', 'circle', 'fuzzy']) });
-function PointsRenderable(ctx, id, values, state, materialId) {
+function PointsRenderable(ctx, id, values, state, materialId, variants) {
     var schema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.GlobalUniformSchema), schema_1.GlobalTextureSchema), schema_1.InternalSchema), exports.PointsSchema);
     var internalValues = {
         uObjectId: mol_util_1.ValueCell.create(id),
     };
     var shaderCode = shader_code_1.PointsShaderCode;
-    var renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'points', shaderCode, schema, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, values), internalValues), materialId);
+    var renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'points', shaderCode, schema, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, values), internalValues), materialId, variants);
     return (0, renderable_1.createRenderable)(renderItem, values, state);
 }
 exports.PointsRenderable = PointsRenderable;

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

@@ -106,11 +106,6 @@ export declare const GlobalUniformSchema: {
     readonly uFogFar: UniformSpec<"f">;
     readonly uFogColor: UniformSpec<"v3">;
     readonly uTransparentBackground: UniformSpec<"b">;
-    readonly uClipObjectType: UniformSpec<"i[]">;
-    readonly uClipObjectInvert: UniformSpec<"b[]">;
-    readonly uClipObjectPosition: UniformSpec<"v3[]">;
-    readonly uClipObjectRotation: UniformSpec<"v4[]">;
-    readonly uClipObjectScale: UniformSpec<"v3[]">;
     readonly uLightDirection: UniformSpec<"v3[]">;
     readonly uLightColor: UniformSpec<"v3[]">;
     readonly uAmbientColor: UniformSpec<"v3">;
@@ -126,6 +121,8 @@ export declare const GlobalUniformSchema: {
     readonly uXrayEdgeFalloff: UniformSpec<"f">;
     readonly uRenderWboit: UniformSpec<"b">;
     readonly uMarkingDepthTest: UniformSpec<"b">;
+    readonly uMarkingType: UniformSpec<"i">;
+    readonly uPickType: UniformSpec<"i">;
 };
 export declare type GlobalUniformSchema = typeof GlobalUniformSchema;
 export declare type GlobalUniformValues = Values<GlobalUniformSchema>;
@@ -165,7 +162,6 @@ export declare const MarkerSchema: {
     readonly uMarker: UniformSpec<"f">;
     readonly uMarkerTexDim: UniformSpec<"v2">;
     readonly tMarker: TextureSpec<"image-uint8">;
-    readonly dMarkerType: DefineSpec<"string">;
     readonly markerAverage: ValueSpec<"number">;
     readonly markerStatus: ValueSpec<"number">;
 };
@@ -206,8 +202,6 @@ export declare const SubstanceSchema: {
 export declare type SubstanceSchema = typeof SubstanceSchema;
 export declare type SubstanceValues = Values<SubstanceSchema>;
 export declare const ClippingSchema: {
-    readonly dClipObjectCount: DefineSpec<"number">;
-    readonly dClipVariant: DefineSpec<"string">;
     readonly uClippingTexDim: UniformSpec<"v2">;
     readonly tClipping: TextureSpec<"image-uint8">;
     readonly dClipping: DefineSpec<"boolean">;
@@ -216,6 +210,13 @@ export declare type ClippingSchema = typeof ClippingSchema;
 export declare type ClippingValues = Values<ClippingSchema>;
 export declare const BaseSchema: {
     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">;
     /**
      * final per-instance transform calculated for instance `i` as
@@ -249,8 +250,6 @@ export declare const BaseSchema: {
     readonly boundingSphere: ValueSpec<"sphere">;
     /** bounding sphere NOT taking aTransform into account */
     readonly invariantBoundingSphere: ValueSpec<"sphere">;
-    readonly dClipObjectCount: DefineSpec<"number">;
-    readonly dClipVariant: DefineSpec<"string">;
     readonly uClippingTexDim: UniformSpec<"v2">;
     readonly tClipping: TextureSpec<"image-uint8">;
     readonly dClipping: DefineSpec<"boolean">;
@@ -279,7 +278,6 @@ export declare const BaseSchema: {
     readonly uMarker: UniformSpec<"f">;
     readonly uMarkerTexDim: UniformSpec<"v2">;
     readonly tMarker: TextureSpec<"image-uint8">;
-    readonly dMarkerType: DefineSpec<"string">;
     readonly markerAverage: ValueSpec<"number">;
     readonly markerStatus: ValueSpec<"number">;
     readonly uColor: UniformSpec<"v3">;

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

@@ -92,11 +92,6 @@ exports.GlobalUniformSchema = {
     uFogFar: UniformSpec('f'),
     uFogColor: UniformSpec('v3'),
     uTransparentBackground: UniformSpec('b'),
-    uClipObjectType: UniformSpec('i[]'),
-    uClipObjectInvert: UniformSpec('b[]'),
-    uClipObjectPosition: UniformSpec('v3[]'),
-    uClipObjectRotation: UniformSpec('v4[]'),
-    uClipObjectScale: UniformSpec('v3[]'),
     uLightDirection: UniformSpec('v3[]'),
     uLightColor: UniformSpec('v3[]'),
     uAmbientColor: UniformSpec('v3'),
@@ -112,6 +107,8 @@ exports.GlobalUniformSchema = {
     uXrayEdgeFalloff: UniformSpec('f'),
     uRenderWboit: UniformSpec('b'),
     uMarkingDepthTest: UniformSpec('b'),
+    uMarkingType: UniformSpec('i'),
+    uPickType: UniformSpec('i'),
 };
 exports.GlobalTextureSchema = {
     tDepth: TextureSpec('texture', 'depth', 'ushort', 'nearest'),
@@ -143,7 +140,6 @@ exports.MarkerSchema = {
     uMarker: UniformSpec('f'),
     uMarkerTexDim: UniformSpec('v2'),
     tMarker: TextureSpec('image-uint8', 'alpha', 'ubyte', 'nearest'),
-    dMarkerType: DefineSpec('string', ['uniform', 'groupInstance']),
     markerAverage: ValueSpec('number'),
     markerStatus: ValueSpec('number'),
 };
@@ -176,13 +172,11 @@ exports.SubstanceSchema = {
     dSubstanceType: DefineSpec('string', ['groupInstance', 'volumeInstance']),
 };
 exports.ClippingSchema = {
-    dClipObjectCount: DefineSpec('number'),
-    dClipVariant: DefineSpec('string', ['instance', 'pixel']),
     uClippingTexDim: UniformSpec('v2'),
     tClipping: TextureSpec('image-uint8', 'alpha', 'ubyte', 'nearest'),
     dClipping: DefineSpec('boolean'),
 };
-exports.BaseSchema = (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)({}, exports.ColorSchema), exports.MarkerSchema), exports.OverpaintSchema), exports.TransparencySchema), exports.SubstanceSchema), exports.ClippingSchema), { dLightCount: DefineSpec('number'), aInstance: AttributeSpec('float32', 1, 1), 
+exports.BaseSchema = (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)({}, exports.ColorSchema), exports.MarkerSchema), exports.OverpaintSchema), exports.TransparencySchema), exports.SubstanceSchema), exports.ClippingSchema), { dLightCount: DefineSpec('number'), dClipObjectCount: DefineSpec('number'), dClipVariant: DefineSpec('string', ['instance', 'pixel']), uClipObjectType: UniformSpec('i[]'), uClipObjectInvert: UniformSpec('b[]'), uClipObjectPosition: UniformSpec('v3[]'), uClipObjectRotation: UniformSpec('v4[]'), uClipObjectScale: UniformSpec('v3[]'), aInstance: AttributeSpec('float32', 1, 1), 
     /**
      * final per-instance transform calculated for instance `i` as
      * `aTransform[i] = matrix * transform[i] * extraTransform[i]`

package/lib/commonjs/mol-gl/renderable/spheres.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 SpheresSchema: {
     aGroup: AttributeSpec<"float32">;
@@ -12,7 +13,7 @@ export declare const SpheresSchema: {
     aMapping: AttributeSpec<"float32">;
     elements: ElementsSpec<"uint32">;
     padding: ValueSpec<"number">;
-    dDoubleSided: DefineSpec<"boolean">;
+    uDoubleSided: UniformSpec<"b">;
     dIgnoreLight: DefineSpec<"boolean">;
     dXrayShaded: DefineSpec<"boolean">;
     uBumpFrequency: UniformSpec<"f">;
@@ -23,6 +24,13 @@ export declare const SpheresSchema: {
     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">;
@@ -42,8 +50,6 @@ export declare const SpheresSchema: {
     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">;
@@ -72,7 +78,6 @@ export declare const SpheresSchema: {
     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,4 +92,4 @@ export declare const SpheresSchema: {
 };
 export declare type SpheresSchema = typeof SpheresSchema;
 export declare type SpheresValues = Values<SpheresSchema>;
-export declare function SpheresRenderable(ctx: WebGLContext, id: number, values: SpheresValues, state: RenderableState, materialId: number): Renderable<SpheresValues>;
+export declare function SpheresRenderable(ctx: WebGLContext, id: number, values: SpheresValues, state: RenderableState, materialId: number, variants: GraphicsRenderVariant[]): Renderable<SpheresValues>;

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

@@ -12,14 +12,14 @@ var render_item_1 = require("../webgl/render-item");
 var schema_1 = require("./schema");
 var shader_code_1 = require("../shader-code");
 var mol_util_1 = require("../../mol-util");
-exports.SpheresSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.BaseSchema), schema_1.SizeSchema), { aGroup: (0, schema_1.AttributeSpec)('float32', 1, 0), aPosition: (0, schema_1.AttributeSpec)('float32', 3, 0), aMapping: (0, schema_1.AttributeSpec)('float32', 2, 0), elements: (0, schema_1.ElementsSpec)('uint32'), padding: (0, schema_1.ValueSpec)('number'), dDoubleSided: (0, schema_1.DefineSpec)('boolean'), dIgnoreLight: (0, schema_1.DefineSpec)('boolean'), dXrayShaded: (0, schema_1.DefineSpec)('boolean'), uBumpFrequency: (0, schema_1.UniformSpec)('f'), uBumpAmplitude: (0, schema_1.UniformSpec)('f') });
-function SpheresRenderable(ctx, id, values, state, materialId) {
+exports.SpheresSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.BaseSchema), schema_1.SizeSchema), { aGroup: (0, schema_1.AttributeSpec)('float32', 1, 0), aPosition: (0, schema_1.AttributeSpec)('float32', 3, 0), aMapping: (0, schema_1.AttributeSpec)('float32', 2, 0), elements: (0, schema_1.ElementsSpec)('uint32'), padding: (0, schema_1.ValueSpec)('number'), uDoubleSided: (0, schema_1.UniformSpec)('b'), dIgnoreLight: (0, schema_1.DefineSpec)('boolean'), dXrayShaded: (0, schema_1.DefineSpec)('boolean'), uBumpFrequency: (0, schema_1.UniformSpec)('f'), uBumpAmplitude: (0, schema_1.UniformSpec)('f') });
+function SpheresRenderable(ctx, id, values, state, materialId, variants) {
     var schema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.GlobalUniformSchema), schema_1.GlobalTextureSchema), schema_1.InternalSchema), exports.SpheresSchema);
     var internalValues = {
         uObjectId: mol_util_1.ValueCell.create(id),
     };
     var shaderCode = shader_code_1.SpheresShaderCode;
-    var renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, values), internalValues), materialId);
+    var renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, values), internalValues), materialId, variants);
     return (0, renderable_1.createRenderable)(renderItem, values, state);
 }
 exports.SpheresRenderable = SpheresRenderable;

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

@@ -5,6 +5,7 @@
  */
 import { Renderable, RenderableState } from '../renderable';
 import { WebGLContext } from '../webgl/context';
+import { GraphicsRenderVariant } from '../webgl/render-item';
 import { AttributeSpec, UniformSpec, Values, TextureSpec, ElementsSpec, ValueSpec } from './schema';
 export declare const TextSchema: {
     aGroup: AttributeSpec<"float32">;
@@ -28,6 +29,13 @@ export declare const TextSchema: {
     dSizeType: import("./schema").DefineSpec<"string">;
     uSizeFactor: UniformSpec<"f">;
     dLightCount: import("./schema").DefineSpec<"number">;
+    dClipObjectCount: import("./schema").DefineSpec<"number">;
+    dClipVariant: import("./schema").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">;
@@ -47,8 +55,6 @@ export declare const TextSchema: {
     hasReflection: ValueSpec<"boolean">;
     boundingSphere: ValueSpec<"sphere">;
     invariantBoundingSphere: ValueSpec<"sphere">;
-    dClipObjectCount: import("./schema").DefineSpec<"number">;
-    dClipVariant: import("./schema").DefineSpec<"string">;
     uClippingTexDim: UniformSpec<"v2">;
     tClipping: TextureSpec<"image-uint8">;
     dClipping: import("./schema").DefineSpec<"boolean">;
@@ -77,7 +83,6 @@ export declare const TextSchema: {
     uMarker: UniformSpec<"f">;
     uMarkerTexDim: UniformSpec<"v2">;
     tMarker: TextureSpec<"image-uint8">;
-    dMarkerType: import("./schema").DefineSpec<"string">;
     markerAverage: ValueSpec<"number">;
     markerStatus: ValueSpec<"number">;
     uColor: UniformSpec<"v3">;
@@ -92,4 +97,4 @@ export declare const TextSchema: {
 };
 export declare type TextSchema = typeof TextSchema;
 export declare type TextValues = Values<TextSchema>;
-export declare function TextRenderable(ctx: WebGLContext, id: number, values: TextValues, state: RenderableState, materialId: number): Renderable<TextValues>;
+export declare function TextRenderable(ctx: WebGLContext, id: number, values: TextValues, state: RenderableState, materialId: number, variants: GraphicsRenderVariant[]): Renderable<TextValues>;

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

@@ -13,13 +13,13 @@ var schema_1 = require("./schema");
 var shader_code_1 = require("../shader-code");
 var mol_util_1 = require("../../mol-util");
 exports.TextSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.BaseSchema), schema_1.SizeSchema), { aGroup: (0, schema_1.AttributeSpec)('float32', 1, 0), aPosition: (0, schema_1.AttributeSpec)('float32', 3, 0), aMapping: (0, schema_1.AttributeSpec)('float32', 2, 0), aDepth: (0, schema_1.AttributeSpec)('float32', 1, 0), elements: (0, schema_1.ElementsSpec)('uint32'), aTexCoord: (0, schema_1.AttributeSpec)('float32', 2, 0), tFont: (0, schema_1.TextureSpec)('image-uint8', 'alpha', 'ubyte', 'linear'), padding: (0, schema_1.ValueSpec)('number'), uBorderWidth: (0, schema_1.UniformSpec)('f'), uBorderColor: (0, schema_1.UniformSpec)('v3'), uOffsetX: (0, schema_1.UniformSpec)('f'), uOffsetY: (0, schema_1.UniformSpec)('f'), uOffsetZ: (0, schema_1.UniformSpec)('f'), uBackgroundColor: (0, schema_1.UniformSpec)('v3'), uBackgroundOpacity: (0, schema_1.UniformSpec)('f') });
-function TextRenderable(ctx, id, values, state, materialId) {
+function TextRenderable(ctx, id, values, state, materialId, variants) {
     var schema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.GlobalUniformSchema), schema_1.GlobalTextureSchema), schema_1.InternalSchema), exports.TextSchema);
     var internalValues = {
         uObjectId: mol_util_1.ValueCell.create(id),
     };
     var shaderCode = shader_code_1.TextShaderCode;
-    var renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, values), internalValues), materialId);
+    var renderItem = (0, render_item_1.createGraphicsRenderItem)(ctx, 'triangles', shaderCode, schema, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, values), internalValues), materialId, variants);
     return (0, renderable_1.createRenderable)(renderItem, values, state);
 }
 exports.TextRenderable = TextRenderable;