molstar 2.3.9 → 3.0.0-dev.2

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

@@ -23,9 +23,12 @@ export declare const CylindersSchema: {
     tSize: import("./schema").TextureSpec<"image-uint8">;
     dSizeType: DefineSpec<"string">;
     uSizeFactor: import("./schema").UniformSpec<"f">;
+    dLightCount: DefineSpec<"number">;
     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">;
@@ -44,13 +47,28 @@ export declare const CylindersSchema: {
     uClippingTexDim: import("./schema").UniformSpec<"v2">;
     tClipping: import("./schema").TextureSpec<"image-uint8">;
     dClipping: DefineSpec<"boolean">;
+    uSubstanceTexDim: import("./schema").UniformSpec<"v2">;
+    tSubstance: import("./schema").TextureSpec<"image-uint8">;
+    dSubstance: DefineSpec<"boolean">;
+    uSubstanceGridDim: import("./schema").UniformSpec<"v3">;
+    uSubstanceGridTransform: import("./schema").UniformSpec<"v4">;
+    tSubstanceGrid: import("./schema").TextureSpec<"texture">;
+    dSubstanceType: DefineSpec<"string">;
     uTransparencyTexDim: import("./schema").UniformSpec<"v2">;
     tTransparency: import("./schema").TextureSpec<"image-uint8">;
     dTransparency: DefineSpec<"boolean">;
     transparencyAverage: ValueSpec<"number">;
+    uTransparencyGridDim: import("./schema").UniformSpec<"v3">;
+    uTransparencyGridTransform: import("./schema").UniformSpec<"v4">;
+    tTransparencyGrid: import("./schema").TextureSpec<"texture">;
+    dTransparencyType: DefineSpec<"string">;
     uOverpaintTexDim: import("./schema").UniformSpec<"v2">;
     tOverpaint: import("./schema").TextureSpec<"image-uint8">;
     dOverpaint: DefineSpec<"boolean">;
+    uOverpaintGridDim: import("./schema").UniformSpec<"v3">;
+    uOverpaintGridTransform: import("./schema").UniformSpec<"v4">;
+    tOverpaintGrid: import("./schema").TextureSpec<"texture">;
+    dOverpaintType: DefineSpec<"string">;
     uMarker: import("./schema").UniformSpec<"f">;
     uMarkerTexDim: import("./schema").UniformSpec<"v2">;
     tMarker: import("./schema").TextureSpec<"image-uint8">;

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

@@ -39,9 +39,12 @@ export declare const DirectVolumeSchema: {
     dFlatShaded: DefineSpec<"boolean">;
     dIgnoreLight: DefineSpec<"boolean">;
     dXrayShaded: DefineSpec<"boolean">;
+    dLightCount: DefineSpec<"number">;
     aInstance: AttributeSpec<"float32">;
     aTransform: AttributeSpec<"float32">;
     uAlpha: UniformSpec<"f">;
+    uMetalness: UniformSpec<"f">;
+    uRoughness: UniformSpec<"f">;
     uVertexCount: UniformSpec<"i">;
     uInstanceCount: UniformSpec<"i">;
     uGroupCount: UniformSpec<"i">;
@@ -60,13 +63,28 @@ export declare const DirectVolumeSchema: {
     uClippingTexDim: UniformSpec<"v2">;
     tClipping: TextureSpec<"image-uint8">;
     dClipping: DefineSpec<"boolean">;
+    uSubstanceTexDim: UniformSpec<"v2">;
+    tSubstance: TextureSpec<"image-uint8">;
+    dSubstance: DefineSpec<"boolean">;
+    uSubstanceGridDim: UniformSpec<"v3">;
+    uSubstanceGridTransform: UniformSpec<"v4">;
+    tSubstanceGrid: TextureSpec<"texture">;
+    dSubstanceType: DefineSpec<"string">;
     uTransparencyTexDim: UniformSpec<"v2">;
     tTransparency: TextureSpec<"image-uint8">;
     dTransparency: DefineSpec<"boolean">;
     transparencyAverage: import("./schema").ValueSpec<"number">;
+    uTransparencyGridDim: UniformSpec<"v3">;
+    uTransparencyGridTransform: UniformSpec<"v4">;
+    tTransparencyGrid: TextureSpec<"texture">;
+    dTransparencyType: DefineSpec<"string">;
     uOverpaintTexDim: UniformSpec<"v2">;
     tOverpaint: TextureSpec<"image-uint8">;
     dOverpaint: DefineSpec<"boolean">;
+    uOverpaintGridDim: UniformSpec<"v3">;
+    uOverpaintGridTransform: UniformSpec<"v4">;
+    tOverpaintGrid: TextureSpec<"texture">;
+    dOverpaintType: DefineSpec<"string">;
     uMarker: UniformSpec<"f">;
     uMarkerTexDim: UniformSpec<"v2">;
     tMarker: TextureSpec<"image-uint8">;

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

@@ -15,9 +15,12 @@ export declare const ImageSchema: {
     tImageTex: TextureSpec<"image-uint8">;
     tGroupTex: TextureSpec<"image-uint8">;
     dInterpolation: DefineSpec<"string">;
+    dLightCount: DefineSpec<"number">;
     aInstance: AttributeSpec<"float32">;
     aTransform: AttributeSpec<"float32">;
     uAlpha: UniformSpec<"f">;
+    uMetalness: UniformSpec<"f">;
+    uRoughness: UniformSpec<"f">;
     uVertexCount: UniformSpec<"i">;
     uInstanceCount: UniformSpec<"i">;
     uGroupCount: UniformSpec<"i">;
@@ -36,13 +39,28 @@ export declare const ImageSchema: {
     uClippingTexDim: UniformSpec<"v2">;
     tClipping: TextureSpec<"image-uint8">;
     dClipping: DefineSpec<"boolean">;
+    uSubstanceTexDim: UniformSpec<"v2">;
+    tSubstance: TextureSpec<"image-uint8">;
+    dSubstance: DefineSpec<"boolean">;
+    uSubstanceGridDim: UniformSpec<"v3">;
+    uSubstanceGridTransform: UniformSpec<"v4">;
+    tSubstanceGrid: TextureSpec<"texture">;
+    dSubstanceType: DefineSpec<"string">;
     uTransparencyTexDim: UniformSpec<"v2">;
     tTransparency: TextureSpec<"image-uint8">;
     dTransparency: DefineSpec<"boolean">;
     transparencyAverage: import("./schema").ValueSpec<"number">;
+    uTransparencyGridDim: UniformSpec<"v3">;
+    uTransparencyGridTransform: UniformSpec<"v4">;
+    tTransparencyGrid: TextureSpec<"texture">;
+    dTransparencyType: DefineSpec<"string">;
     uOverpaintTexDim: UniformSpec<"v2">;
     tOverpaint: TextureSpec<"image-uint8">;
     dOverpaint: DefineSpec<"boolean">;
+    uOverpaintGridDim: UniformSpec<"v3">;
+    uOverpaintGridTransform: UniformSpec<"v4">;
+    tOverpaintGrid: TextureSpec<"texture">;
+    dOverpaintType: DefineSpec<"string">;
     uMarker: UniformSpec<"f">;
     uMarkerTexDim: UniformSpec<"v2">;
     tMarker: TextureSpec<"image-uint8">;

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

@@ -20,9 +20,12 @@ export declare const LinesSchema: {
     tSize: import("./schema").TextureSpec<"image-uint8">;
     dSizeType: DefineSpec<"string">;
     uSizeFactor: import("./schema").UniformSpec<"f">;
+    dLightCount: DefineSpec<"number">;
     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">;
@@ -41,13 +44,28 @@ export declare const LinesSchema: {
     uClippingTexDim: import("./schema").UniformSpec<"v2">;
     tClipping: import("./schema").TextureSpec<"image-uint8">;
     dClipping: DefineSpec<"boolean">;
+    uSubstanceTexDim: import("./schema").UniformSpec<"v2">;
+    tSubstance: import("./schema").TextureSpec<"image-uint8">;
+    dSubstance: DefineSpec<"boolean">;
+    uSubstanceGridDim: import("./schema").UniformSpec<"v3">;
+    uSubstanceGridTransform: import("./schema").UniformSpec<"v4">;
+    tSubstanceGrid: import("./schema").TextureSpec<"texture">;
+    dSubstanceType: DefineSpec<"string">;
     uTransparencyTexDim: import("./schema").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">;
+    tTransparencyGrid: import("./schema").TextureSpec<"texture">;
+    dTransparencyType: DefineSpec<"string">;
     uOverpaintTexDim: import("./schema").UniformSpec<"v2">;
     tOverpaint: import("./schema").TextureSpec<"image-uint8">;
     dOverpaint: DefineSpec<"boolean">;
+    uOverpaintGridDim: import("./schema").UniformSpec<"v3">;
+    uOverpaintGridTransform: import("./schema").UniformSpec<"v4">;
+    tOverpaintGrid: import("./schema").TextureSpec<"texture">;
+    dOverpaintType: DefineSpec<"string">;
     uMarker: import("./schema").UniformSpec<"f">;
     uMarkerTexDim: import("./schema").UniformSpec<"v2">;
     tMarker: import("./schema").TextureSpec<"image-uint8">;

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

@@ -17,9 +17,12 @@ export declare const MeshSchema: {
     readonly dIgnoreLight: DefineSpec<"boolean">;
     readonly dXrayShaded: DefineSpec<"boolean">;
     readonly meta: ValueSpec<"unknown">;
+    readonly dLightCount: DefineSpec<"number">;
     readonly aInstance: AttributeSpec<"float32">;
     readonly aTransform: AttributeSpec<"float32">;
     readonly uAlpha: import("./schema").UniformSpec<"f">;
+    readonly uMetalness: import("./schema").UniformSpec<"f">;
+    readonly uRoughness: import("./schema").UniformSpec<"f">;
     readonly uVertexCount: import("./schema").UniformSpec<"i">;
     readonly uInstanceCount: import("./schema").UniformSpec<"i">;
     readonly uGroupCount: import("./schema").UniformSpec<"i">;
@@ -38,13 +41,28 @@ export declare const MeshSchema: {
     readonly uClippingTexDim: import("./schema").UniformSpec<"v2">;
     readonly tClipping: import("./schema").TextureSpec<"image-uint8">;
     readonly dClipping: DefineSpec<"boolean">;
+    readonly uSubstanceTexDim: import("./schema").UniformSpec<"v2">;
+    readonly tSubstance: import("./schema").TextureSpec<"image-uint8">;
+    readonly dSubstance: DefineSpec<"boolean">;
+    readonly uSubstanceGridDim: import("./schema").UniformSpec<"v3">;
+    readonly uSubstanceGridTransform: import("./schema").UniformSpec<"v4">;
+    readonly tSubstanceGrid: import("./schema").TextureSpec<"texture">;
+    readonly dSubstanceType: DefineSpec<"string">;
     readonly uTransparencyTexDim: import("./schema").UniformSpec<"v2">;
     readonly tTransparency: import("./schema").TextureSpec<"image-uint8">;
     readonly dTransparency: DefineSpec<"boolean">;
     readonly transparencyAverage: ValueSpec<"number">;
+    readonly uTransparencyGridDim: import("./schema").UniformSpec<"v3">;
+    readonly uTransparencyGridTransform: import("./schema").UniformSpec<"v4">;
+    readonly tTransparencyGrid: import("./schema").TextureSpec<"texture">;
+    readonly dTransparencyType: DefineSpec<"string">;
     readonly uOverpaintTexDim: import("./schema").UniformSpec<"v2">;
     readonly tOverpaint: import("./schema").TextureSpec<"image-uint8">;
     readonly dOverpaint: DefineSpec<"boolean">;
+    readonly uOverpaintGridDim: import("./schema").UniformSpec<"v3">;
+    readonly uOverpaintGridTransform: import("./schema").UniformSpec<"v4">;
+    readonly tOverpaintGrid: import("./schema").TextureSpec<"texture">;
+    readonly dOverpaintType: DefineSpec<"string">;
     readonly uMarker: import("./schema").UniformSpec<"f">;
     readonly uMarkerTexDim: import("./schema").UniformSpec<"v2">;
     readonly tMarker: import("./schema").TextureSpec<"image-uint8">;

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

@@ -16,9 +16,12 @@ export declare const PointsSchema: {
     tSize: import("./schema").TextureSpec<"image-uint8">;
     dSizeType: DefineSpec<"string">;
     uSizeFactor: import("./schema").UniformSpec<"f">;
+    dLightCount: DefineSpec<"number">;
     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">;
@@ -37,13 +40,28 @@ export declare const PointsSchema: {
     uClippingTexDim: import("./schema").UniformSpec<"v2">;
     tClipping: import("./schema").TextureSpec<"image-uint8">;
     dClipping: DefineSpec<"boolean">;
+    uSubstanceTexDim: import("./schema").UniformSpec<"v2">;
+    tSubstance: import("./schema").TextureSpec<"image-uint8">;
+    dSubstance: DefineSpec<"boolean">;
+    uSubstanceGridDim: import("./schema").UniformSpec<"v3">;
+    uSubstanceGridTransform: import("./schema").UniformSpec<"v4">;
+    tSubstanceGrid: import("./schema").TextureSpec<"texture">;
+    dSubstanceType: DefineSpec<"string">;
     uTransparencyTexDim: import("./schema").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">;
+    tTransparencyGrid: import("./schema").TextureSpec<"texture">;
+    dTransparencyType: DefineSpec<"string">;
     uOverpaintTexDim: import("./schema").UniformSpec<"v2">;
     tOverpaint: import("./schema").TextureSpec<"image-uint8">;
     dOverpaint: DefineSpec<"boolean">;
+    uOverpaintGridDim: import("./schema").UniformSpec<"v3">;
+    uOverpaintGridTransform: import("./schema").UniformSpec<"v4">;
+    tOverpaintGrid: import("./schema").TextureSpec<"texture">;
+    dOverpaintType: DefineSpec<"string">;
     uMarker: import("./schema").UniformSpec<"f">;
     uMarkerTexDim: import("./schema").UniformSpec<"v2">;
     tMarker: import("./schema").TextureSpec<"image-uint8">;

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

@@ -9,8 +9,7 @@ import { createGraphicsRenderItem } from '../webgl/render-item';
 import { GlobalUniformSchema, BaseSchema, AttributeSpec, DefineSpec, InternalSchema, SizeSchema, GlobalTextureSchema } from './schema';
 import { PointsShaderCode } from '../shader-code';
 import { ValueCell } from '../../mol-util';
-import { Points } from '../../mol-geo/geometry/points/points';
-export var PointsSchema = __assign(__assign(__assign({}, BaseSchema), SizeSchema), { aGroup: AttributeSpec('float32', 1, 0), aPosition: AttributeSpec('float32', 3, 0), dPointSizeAttenuation: DefineSpec('boolean'), dPointStyle: DefineSpec('string', Points.StyleTypeNames) });
+export var PointsSchema = __assign(__assign(__assign({}, BaseSchema), SizeSchema), { aGroup: AttributeSpec('float32', 1, 0), aPosition: AttributeSpec('float32', 3, 0), dPointSizeAttenuation: DefineSpec('boolean'), dPointStyle: DefineSpec('string', ['square', 'circle', 'fuzzy']) });
 export function PointsRenderable(ctx, id, values, state, materialId) {
     var schema = __assign(__assign(__assign(__assign({}, GlobalUniformSchema), GlobalTextureSchema), InternalSchema), PointsSchema);
     var internalValues = {

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

@@ -111,11 +111,9 @@ export declare const GlobalUniformSchema: {
     readonly uClipObjectPosition: UniformSpec<"v3[]">;
     readonly uClipObjectRotation: UniformSpec<"v4[]">;
     readonly uClipObjectScale: UniformSpec<"v3[]">;
-    readonly uLightIntensity: UniformSpec<"f">;
-    readonly uAmbientIntensity: UniformSpec<"f">;
-    readonly uMetalness: UniformSpec<"f">;
-    readonly uRoughness: UniformSpec<"f">;
-    readonly uReflectivity: UniformSpec<"f">;
+    readonly uLightDirection: UniformSpec<"v3[]">;
+    readonly uLightColor: UniformSpec<"v3[]">;
+    readonly uAmbientColor: UniformSpec<"v3">;
     readonly uPickingAlphaThreshold: UniformSpec<"f">;
     readonly uInteriorDarkening: UniformSpec<"f">;
     readonly uInteriorColorFlag: UniformSpec<"b">;
@@ -177,6 +175,10 @@ export declare const OverpaintSchema: {
     readonly uOverpaintTexDim: UniformSpec<"v2">;
     readonly tOverpaint: TextureSpec<"image-uint8">;
     readonly dOverpaint: DefineSpec<"boolean">;
+    readonly uOverpaintGridDim: UniformSpec<"v3">;
+    readonly uOverpaintGridTransform: UniformSpec<"v4">;
+    readonly tOverpaintGrid: TextureSpec<"texture">;
+    readonly dOverpaintType: DefineSpec<"string">;
 };
 export declare type OverpaintSchema = typeof OverpaintSchema;
 export declare type OverpaintValues = Values<OverpaintSchema>;
@@ -185,9 +187,24 @@ export declare const TransparencySchema: {
     readonly tTransparency: TextureSpec<"image-uint8">;
     readonly dTransparency: DefineSpec<"boolean">;
     readonly transparencyAverage: ValueSpec<"number">;
+    readonly uTransparencyGridDim: UniformSpec<"v3">;
+    readonly uTransparencyGridTransform: UniformSpec<"v4">;
+    readonly tTransparencyGrid: TextureSpec<"texture">;
+    readonly dTransparencyType: DefineSpec<"string">;
 };
 export declare type TransparencySchema = typeof TransparencySchema;
 export declare type TransparencyValues = Values<TransparencySchema>;
+export declare const SubstanceSchema: {
+    readonly uSubstanceTexDim: UniformSpec<"v2">;
+    readonly tSubstance: TextureSpec<"image-uint8">;
+    readonly dSubstance: DefineSpec<"boolean">;
+    readonly uSubstanceGridDim: UniformSpec<"v3">;
+    readonly uSubstanceGridTransform: UniformSpec<"v4">;
+    readonly tSubstanceGrid: TextureSpec<"texture">;
+    readonly dSubstanceType: DefineSpec<"string">;
+};
+export declare type SubstanceSchema = typeof SubstanceSchema;
+export declare type SubstanceValues = Values<SubstanceSchema>;
 export declare const ClippingSchema: {
     readonly dClipObjectCount: DefineSpec<"number">;
     readonly dClipVariant: DefineSpec<"string">;
@@ -198,6 +215,7 @@ export declare const ClippingSchema: {
 export declare type ClippingSchema = typeof ClippingSchema;
 export declare type ClippingValues = Values<ClippingSchema>;
 export declare const BaseSchema: {
+    readonly dLightCount: DefineSpec<"number">;
     readonly aInstance: AttributeSpec<"float32">;
     /**
      * final per-instance transform calculated for instance `i` as
@@ -208,6 +226,8 @@ export declare const BaseSchema: {
      * final alpha, calculated as `values.alpha * state.alpha`
      */
     readonly uAlpha: UniformSpec<"f">;
+    readonly uMetalness: UniformSpec<"f">;
+    readonly uRoughness: UniformSpec<"f">;
     readonly uVertexCount: UniformSpec<"i">;
     readonly uInstanceCount: UniformSpec<"i">;
     readonly uGroupCount: UniformSpec<"i">;
@@ -233,13 +253,28 @@ export declare const BaseSchema: {
     readonly uClippingTexDim: UniformSpec<"v2">;
     readonly tClipping: TextureSpec<"image-uint8">;
     readonly dClipping: DefineSpec<"boolean">;
+    readonly uSubstanceTexDim: UniformSpec<"v2">;
+    readonly tSubstance: TextureSpec<"image-uint8">;
+    readonly dSubstance: DefineSpec<"boolean">;
+    readonly uSubstanceGridDim: UniformSpec<"v3">;
+    readonly uSubstanceGridTransform: UniformSpec<"v4">;
+    readonly tSubstanceGrid: TextureSpec<"texture">;
+    readonly dSubstanceType: DefineSpec<"string">;
     readonly uTransparencyTexDim: UniformSpec<"v2">;
     readonly tTransparency: TextureSpec<"image-uint8">;
     readonly dTransparency: DefineSpec<"boolean">;
     readonly transparencyAverage: ValueSpec<"number">;
+    readonly uTransparencyGridDim: UniformSpec<"v3">;
+    readonly uTransparencyGridTransform: UniformSpec<"v4">;
+    readonly tTransparencyGrid: TextureSpec<"texture">;
+    readonly dTransparencyType: DefineSpec<"string">;
     readonly uOverpaintTexDim: UniformSpec<"v2">;
     readonly tOverpaint: TextureSpec<"image-uint8">;
     readonly dOverpaint: DefineSpec<"boolean">;
+    readonly uOverpaintGridDim: UniformSpec<"v3">;
+    readonly uOverpaintGridTransform: UniformSpec<"v4">;
+    readonly tOverpaintGrid: TextureSpec<"texture">;
+    readonly dOverpaintType: DefineSpec<"string">;
     readonly uMarker: UniformSpec<"f">;
     readonly uMarkerTexDim: UniformSpec<"v2">;
     readonly tMarker: TextureSpec<"image-uint8">;

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

@@ -86,14 +86,9 @@ export var GlobalUniformSchema = {
     uClipObjectPosition: UniformSpec('v3[]'),
     uClipObjectRotation: UniformSpec('v4[]'),
     uClipObjectScale: UniformSpec('v3[]'),
-    // all the following could in principle be per object
-    // as a kind of 'material' parameter set
-    // would need to test performance implications
-    uLightIntensity: UniformSpec('f'),
-    uAmbientIntensity: UniformSpec('f'),
-    uMetalness: UniformSpec('f'),
-    uRoughness: UniformSpec('f'),
-    uReflectivity: UniformSpec('f'),
+    uLightDirection: UniformSpec('v3[]'),
+    uLightColor: UniformSpec('v3[]'),
+    uAmbientColor: UniformSpec('v3'),
     uPickingAlphaThreshold: UniformSpec('f'),
     uInteriorDarkening: UniformSpec('f'),
     uInteriorColorFlag: UniformSpec('b'),
@@ -145,12 +140,29 @@ export var OverpaintSchema = {
     uOverpaintTexDim: UniformSpec('v2'),
     tOverpaint: TextureSpec('image-uint8', 'rgba', 'ubyte', 'nearest'),
     dOverpaint: DefineSpec('boolean'),
+    uOverpaintGridDim: UniformSpec('v3'),
+    uOverpaintGridTransform: UniformSpec('v4'),
+    tOverpaintGrid: TextureSpec('texture', 'rgba', 'ubyte', 'linear'),
+    dOverpaintType: DefineSpec('string', ['groupInstance', 'volumeInstance']),
 };
 export var TransparencySchema = {
     uTransparencyTexDim: UniformSpec('v2'),
     tTransparency: TextureSpec('image-uint8', 'alpha', 'ubyte', 'nearest'),
     dTransparency: DefineSpec('boolean'),
     transparencyAverage: ValueSpec('number'),
+    uTransparencyGridDim: UniformSpec('v3'),
+    uTransparencyGridTransform: UniformSpec('v4'),
+    tTransparencyGrid: TextureSpec('texture', 'alpha', 'ubyte', 'linear'),
+    dTransparencyType: DefineSpec('string', ['groupInstance', 'volumeInstance']),
+};
+export var SubstanceSchema = {
+    uSubstanceTexDim: UniformSpec('v2'),
+    tSubstance: TextureSpec('image-uint8', 'rgb', 'ubyte', 'nearest'),
+    dSubstance: DefineSpec('boolean'),
+    uSubstanceGridDim: UniformSpec('v3'),
+    uSubstanceGridTransform: UniformSpec('v4'),
+    tSubstanceGrid: TextureSpec('texture', 'rgb', 'ubyte', 'linear'),
+    dSubstanceType: DefineSpec('string', ['groupInstance', 'volumeInstance']),
 };
 export var ClippingSchema = {
     dClipObjectCount: DefineSpec('number'),
@@ -159,7 +171,7 @@ export var ClippingSchema = {
     tClipping: TextureSpec('image-uint8', 'alpha', 'ubyte', 'nearest'),
     dClipping: DefineSpec('boolean'),
 };
-export var BaseSchema = __assign(__assign(__assign(__assign(__assign(__assign({}, ColorSchema), MarkerSchema), OverpaintSchema), TransparencySchema), ClippingSchema), { aInstance: AttributeSpec('float32', 1, 1), 
+export var BaseSchema = __assign(__assign(__assign(__assign(__assign(__assign(__assign({}, ColorSchema), MarkerSchema), OverpaintSchema), TransparencySchema), SubstanceSchema), ClippingSchema), { dLightCount: DefineSpec('number'), aInstance: AttributeSpec('float32', 1, 1), 
     /**
      * final per-instance transform calculated for instance `i` as
      * `aTransform[i] = matrix * transform[i] * extraTransform[i]`
@@ -168,7 +180,7 @@ export var BaseSchema = __assign(__assign(__assign(__assign(__assign(__assign({}
     /**
      * final alpha, calculated as `values.alpha * state.alpha`
      */
-    uAlpha: UniformSpec('f', 'material'), uVertexCount: UniformSpec('i'), uInstanceCount: UniformSpec('i'), uGroupCount: UniformSpec('i'), uInvariantBoundingSphere: UniformSpec('v4'), drawCount: ValueSpec('number'), instanceCount: ValueSpec('number'), 
+    uAlpha: UniformSpec('f', 'material'), uMetalness: UniformSpec('f', 'material'), uRoughness: UniformSpec('f', 'material'), uVertexCount: UniformSpec('i'), uInstanceCount: UniformSpec('i'), uGroupCount: UniformSpec('i'), uInvariantBoundingSphere: UniformSpec('v4'), drawCount: ValueSpec('number'), instanceCount: ValueSpec('number'), 
     /** base alpha, see uAlpha  */
     alpha: ValueSpec('number'), 
     /** global transform, see aTransform */

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

@@ -20,9 +20,12 @@ export declare const SpheresSchema: {
     tSize: import("./schema").TextureSpec<"image-uint8">;
     dSizeType: DefineSpec<"string">;
     uSizeFactor: import("./schema").UniformSpec<"f">;
+    dLightCount: DefineSpec<"number">;
     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">;
@@ -41,13 +44,28 @@ export declare const SpheresSchema: {
     uClippingTexDim: import("./schema").UniformSpec<"v2">;
     tClipping: import("./schema").TextureSpec<"image-uint8">;
     dClipping: DefineSpec<"boolean">;
+    uSubstanceTexDim: import("./schema").UniformSpec<"v2">;
+    tSubstance: import("./schema").TextureSpec<"image-uint8">;
+    dSubstance: DefineSpec<"boolean">;
+    uSubstanceGridDim: import("./schema").UniformSpec<"v3">;
+    uSubstanceGridTransform: import("./schema").UniformSpec<"v4">;
+    tSubstanceGrid: import("./schema").TextureSpec<"texture">;
+    dSubstanceType: DefineSpec<"string">;
     uTransparencyTexDim: import("./schema").UniformSpec<"v2">;
     tTransparency: import("./schema").TextureSpec<"image-uint8">;
     dTransparency: DefineSpec<"boolean">;
     transparencyAverage: ValueSpec<"number">;
+    uTransparencyGridDim: import("./schema").UniformSpec<"v3">;
+    uTransparencyGridTransform: import("./schema").UniformSpec<"v4">;
+    tTransparencyGrid: import("./schema").TextureSpec<"texture">;
+    dTransparencyType: DefineSpec<"string">;
     uOverpaintTexDim: import("./schema").UniformSpec<"v2">;
     tOverpaint: import("./schema").TextureSpec<"image-uint8">;
     dOverpaint: DefineSpec<"boolean">;
+    uOverpaintGridDim: import("./schema").UniformSpec<"v3">;
+    uOverpaintGridTransform: import("./schema").UniformSpec<"v4">;
+    tOverpaintGrid: import("./schema").TextureSpec<"texture">;
+    dOverpaintType: DefineSpec<"string">;
     uMarker: import("./schema").UniformSpec<"f">;
     uMarkerTexDim: import("./schema").UniformSpec<"v2">;
     tMarker: import("./schema").TextureSpec<"image-uint8">;

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

@@ -27,9 +27,12 @@ export declare const TextSchema: {
     tSize: TextureSpec<"image-uint8">;
     dSizeType: import("./schema").DefineSpec<"string">;
     uSizeFactor: UniformSpec<"f">;
+    dLightCount: import("./schema").DefineSpec<"number">;
     aInstance: AttributeSpec<"float32">;
     aTransform: AttributeSpec<"float32">;
     uAlpha: UniformSpec<"f">;
+    uMetalness: UniformSpec<"f">;
+    uRoughness: UniformSpec<"f">;
     uVertexCount: UniformSpec<"i">;
     uInstanceCount: UniformSpec<"i">;
     uGroupCount: UniformSpec<"i">;
@@ -48,13 +51,28 @@ export declare const TextSchema: {
     uClippingTexDim: UniformSpec<"v2">;
     tClipping: TextureSpec<"image-uint8">;
     dClipping: import("./schema").DefineSpec<"boolean">;
+    uSubstanceTexDim: UniformSpec<"v2">;
+    tSubstance: TextureSpec<"image-uint8">;
+    dSubstance: import("./schema").DefineSpec<"boolean">;
+    uSubstanceGridDim: UniformSpec<"v3">;
+    uSubstanceGridTransform: UniformSpec<"v4">;
+    tSubstanceGrid: TextureSpec<"texture">;
+    dSubstanceType: import("./schema").DefineSpec<"string">;
     uTransparencyTexDim: UniformSpec<"v2">;
     tTransparency: TextureSpec<"image-uint8">;
     dTransparency: import("./schema").DefineSpec<"boolean">;
     transparencyAverage: ValueSpec<"number">;
+    uTransparencyGridDim: UniformSpec<"v3">;
+    uTransparencyGridTransform: UniformSpec<"v4">;
+    tTransparencyGrid: TextureSpec<"texture">;
+    dTransparencyType: import("./schema").DefineSpec<"string">;
     uOverpaintTexDim: UniformSpec<"v2">;
     tOverpaint: TextureSpec<"image-uint8">;
     dOverpaint: import("./schema").DefineSpec<"boolean">;
+    uOverpaintGridDim: UniformSpec<"v3">;
+    uOverpaintGridTransform: UniformSpec<"v4">;
+    tOverpaintGrid: TextureSpec<"texture">;
+    dOverpaintType: import("./schema").DefineSpec<"string">;
     uMarker: UniformSpec<"f">;
     uMarkerTexDim: UniformSpec<"v2">;
     tMarker: TextureSpec<"image-uint8">;

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

@@ -5,7 +5,7 @@
  */
 import { Renderable, RenderableState } from '../renderable';
 import { WebGLContext } from '../webgl/context';
-import { DefineSpec, Values, UniformSpec, TextureSpec } from './schema';
+import { DefineSpec, Values, UniformSpec, TextureSpec, ValueSpec } from './schema';
 export declare const TextureMeshSchema: {
     uGeoTexDim: UniformSpec<"v2">;
     tPosition: TextureSpec<"texture">;
@@ -17,40 +17,59 @@ export declare const TextureMeshSchema: {
     dIgnoreLight: DefineSpec<"boolean">;
     dXrayShaded: DefineSpec<"boolean">;
     dGeoTexture: DefineSpec<"boolean">;
+    meta: ValueSpec<"unknown">;
+    dLightCount: DefineSpec<"number">;
     aInstance: import("./schema").AttributeSpec<"float32">;
     aTransform: import("./schema").AttributeSpec<"float32">;
     uAlpha: UniformSpec<"f">;
+    uMetalness: UniformSpec<"f">;
+    uRoughness: 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">;
-    matrix: import("./schema").ValueSpec<"m4">;
-    transform: import("./schema").ValueSpec<"float32">;
-    extraTransform: import("./schema").ValueSpec<"float32">;
-    hasReflection: import("./schema").ValueSpec<"boolean">;
-    boundingSphere: import("./schema").ValueSpec<"sphere">;
-    invariantBoundingSphere: import("./schema").ValueSpec<"sphere">;
+    drawCount: ValueSpec<"number">;
+    instanceCount: ValueSpec<"number">;
+    alpha: ValueSpec<"number">;
+    matrix: ValueSpec<"m4">;
+    transform: ValueSpec<"float32">;
+    extraTransform: ValueSpec<"float32">;
+    hasReflection: ValueSpec<"boolean">;
+    boundingSphere: ValueSpec<"sphere">;
+    invariantBoundingSphere: ValueSpec<"sphere">;
     dClipObjectCount: DefineSpec<"number">;
     dClipVariant: DefineSpec<"string">;
     uClippingTexDim: UniformSpec<"v2">;
     tClipping: TextureSpec<"image-uint8">;
     dClipping: DefineSpec<"boolean">;
+    uSubstanceTexDim: UniformSpec<"v2">;
+    tSubstance: TextureSpec<"image-uint8">;
+    dSubstance: DefineSpec<"boolean">;
+    uSubstanceGridDim: UniformSpec<"v3">;
+    uSubstanceGridTransform: UniformSpec<"v4">;
+    tSubstanceGrid: TextureSpec<"texture">;
+    dSubstanceType: DefineSpec<"string">;
     uTransparencyTexDim: UniformSpec<"v2">;
     tTransparency: TextureSpec<"image-uint8">;
     dTransparency: DefineSpec<"boolean">;
-    transparencyAverage: import("./schema").ValueSpec<"number">;
+    transparencyAverage: ValueSpec<"number">;
+    uTransparencyGridDim: UniformSpec<"v3">;
+    uTransparencyGridTransform: UniformSpec<"v4">;
+    tTransparencyGrid: TextureSpec<"texture">;
+    dTransparencyType: DefineSpec<"string">;
     uOverpaintTexDim: UniformSpec<"v2">;
     tOverpaint: TextureSpec<"image-uint8">;
     dOverpaint: DefineSpec<"boolean">;
+    uOverpaintGridDim: UniformSpec<"v3">;
+    uOverpaintGridTransform: UniformSpec<"v4">;
+    tOverpaintGrid: TextureSpec<"texture">;
+    dOverpaintType: DefineSpec<"string">;
     uMarker: UniformSpec<"f">;
     uMarkerTexDim: UniformSpec<"v2">;
     tMarker: TextureSpec<"image-uint8">;
     dMarkerType: DefineSpec<"string">;
-    markerAverage: import("./schema").ValueSpec<"number">;
-    markerStatus: import("./schema").ValueSpec<"number">;
+    markerAverage: ValueSpec<"number">;
+    markerStatus: ValueSpec<"number">;
     uColor: UniformSpec<"v3">;
     uColorTexDim: UniformSpec<"v2">;
     uColorGridDim: UniformSpec<"v3">;

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

@@ -6,10 +6,10 @@
 import { __assign } from "tslib";
 import { createRenderable } from '../renderable';
 import { createGraphicsRenderItem } from '../webgl/render-item';
-import { GlobalUniformSchema, BaseSchema, DefineSpec, InternalSchema, UniformSpec, TextureSpec, GlobalTextureSchema } from './schema';
+import { GlobalUniformSchema, BaseSchema, DefineSpec, InternalSchema, UniformSpec, TextureSpec, GlobalTextureSchema, ValueSpec } from './schema';
 import { MeshShaderCode } from '../shader-code';
 import { ValueCell } from '../../mol-util';
-export var TextureMeshSchema = __assign(__assign({}, BaseSchema), { uGeoTexDim: UniformSpec('v2', 'buffered'), tPosition: TextureSpec('texture', 'rgb', 'float', 'nearest'), tGroup: TextureSpec('texture', 'alpha', 'float', 'nearest'), tNormal: TextureSpec('texture', 'rgb', 'float', 'nearest'), dFlatShaded: DefineSpec('boolean'), dDoubleSided: DefineSpec('boolean'), dFlipSided: DefineSpec('boolean'), dIgnoreLight: DefineSpec('boolean'), dXrayShaded: DefineSpec('boolean'), dGeoTexture: DefineSpec('boolean') });
+export var TextureMeshSchema = __assign(__assign({}, BaseSchema), { uGeoTexDim: UniformSpec('v2', 'buffered'), tPosition: TextureSpec('texture', 'rgb', 'float', 'nearest'), tGroup: TextureSpec('texture', 'alpha', 'float', 'nearest'), tNormal: TextureSpec('texture', 'rgb', 'float', 'nearest'), dFlatShaded: DefineSpec('boolean'), dDoubleSided: DefineSpec('boolean'), dFlipSided: DefineSpec('boolean'), dIgnoreLight: DefineSpec('boolean'), dXrayShaded: DefineSpec('boolean'), dGeoTexture: DefineSpec('boolean'), meta: ValueSpec('unknown') });
 export function TextureMeshRenderable(ctx, id, values, state, materialId) {
     var schema = __assign(__assign(__assign(__assign({}, GlobalUniformSchema), GlobalTextureSchema), InternalSchema), TextureMeshSchema);
     var internalValues = {