molstar 2.4.0 → 3.0.0-dev.3

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

@@ -59,7 +59,11 @@ export declare namespace Text {
         fontVariant: PD.Select<import("./font-atlas").FontVariant>;
         fontWeight: PD.Select<import("./font-atlas").FontWeight>;
         alpha: PD.Numeric;
-        quality: PD.Select<"custom" | "auto" | "highest" | "higher" | "high" | "medium" | "low" | "lower" | "lowest">;
+        quality: PD.Select<"auto" | "medium" | "high" | "low" | "custom" | "highest" | "higher" | "lower" | "lowest">;
+        material: PD.Group<PD.Normalize<{
+            metalness: number;
+            roughness: number;
+        }>>;
     };
     type Params = typeof Params;
     const Utils: GeometryUtils<Text, Params>;

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

@@ -26,6 +26,7 @@ var transparency_data_1 = require("../transparency-data");
 var util_2 = require("../../../mol-data/util");
 var util_3 = require("../../util");
 var clipping_data_1 = require("../clipping-data");
+var substance_data_1 = require("../substance-data");
 var Text;
 (function (Text) {
     function create(fontTexture, centers, mappings, depths, indices, groups, tcoords, charCount, text) {
@@ -144,12 +145,13 @@ var Text;
         var marker = (0, marker_data_1.createMarkers)(instanceCount * groupCount);
         var overpaint = (0, overpaint_data_1.createEmptyOverpaint)();
         var transparency = (0, transparency_data_1.createEmptyTransparency)();
+        var substance = (0, substance_data_1.createEmptySubstance)();
         var clipping = (0, clipping_data_1.createEmptyClipping)();
         var counts = { drawCount: text.charCount * 2 * 3, vertexCount: text.charCount * 4, groupCount: groupCount, instanceCount: instanceCount };
         var padding = getPadding(text.mappingBuffer.ref.value, text.depthBuffer.ref.value, text.charCount, (0, size_data_1.getMaxSize)(size));
         var invariantBoundingSphere = geometry_1.Sphere3D.expand((0, geometry_1.Sphere3D)(), text.boundingSphere, padding);
         var boundingSphere = (0, util_1.calculateTransformBoundingSphere)(invariantBoundingSphere, transform.aTransform.ref.value, instanceCount);
-        return (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({ aPosition: text.centerBuffer, aMapping: text.mappingBuffer, aDepth: text.depthBuffer, aGroup: text.groupBuffer, elements: text.indexBuffer, boundingSphere: mol_util_1.ValueCell.create(boundingSphere), invariantBoundingSphere: mol_util_1.ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: mol_util_1.ValueCell.create(linear_algebra_1.Vec4.ofSphere(invariantBoundingSphere)) }, color), size), marker), overpaint), transparency), clipping), transform), { aTexCoord: text.tcoordBuffer, tFont: text.fontTexture, padding: mol_util_1.ValueCell.create(padding) }), base_1.BaseGeometry.createValues(props, counts)), { uSizeFactor: mol_util_1.ValueCell.create(props.sizeFactor), uBorderWidth: mol_util_1.ValueCell.create((0, interpolate_1.clamp)(props.borderWidth, 0, 0.5)), uBorderColor: mol_util_1.ValueCell.create(color_1.Color.toArrayNormalized(props.borderColor, linear_algebra_1.Vec3.zero(), 0)), uOffsetX: mol_util_1.ValueCell.create(props.offsetX), uOffsetY: mol_util_1.ValueCell.create(props.offsetY), uOffsetZ: mol_util_1.ValueCell.create(props.offsetZ), uBackgroundColor: mol_util_1.ValueCell.create(color_1.Color.toArrayNormalized(props.backgroundColor, linear_algebra_1.Vec3.zero(), 0)), uBackgroundOpacity: mol_util_1.ValueCell.create(props.backgroundOpacity) });
+        return (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({ aPosition: text.centerBuffer, aMapping: text.mappingBuffer, aDepth: text.depthBuffer, aGroup: text.groupBuffer, elements: text.indexBuffer, boundingSphere: mol_util_1.ValueCell.create(boundingSphere), invariantBoundingSphere: mol_util_1.ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: mol_util_1.ValueCell.create(linear_algebra_1.Vec4.ofSphere(invariantBoundingSphere)) }, color), size), marker), overpaint), transparency), substance), clipping), transform), { aTexCoord: text.tcoordBuffer, tFont: text.fontTexture, padding: mol_util_1.ValueCell.create(padding) }), base_1.BaseGeometry.createValues(props, counts)), { uSizeFactor: mol_util_1.ValueCell.create(props.sizeFactor), uBorderWidth: mol_util_1.ValueCell.create((0, interpolate_1.clamp)(props.borderWidth, 0, 0.5)), uBorderColor: mol_util_1.ValueCell.create(color_1.Color.toArrayNormalized(props.borderColor, linear_algebra_1.Vec3.zero(), 0)), uOffsetX: mol_util_1.ValueCell.create(props.offsetX), uOffsetY: mol_util_1.ValueCell.create(props.offsetY), uOffsetZ: mol_util_1.ValueCell.create(props.offsetZ), uBackgroundColor: mol_util_1.ValueCell.create(color_1.Color.toArrayNormalized(props.backgroundColor, linear_algebra_1.Vec3.zero(), 0)), uBackgroundOpacity: mol_util_1.ValueCell.create(props.backgroundOpacity) });
     }
     function createValuesSimple(text, props, colorValue, sizeValue, transform) {
         var s = base_1.BaseGeometry.createSimple(colorValue, sizeValue, transform);

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

@@ -66,4 +66,5 @@ export declare function calcTextureMeshColorSmoothing(input: ColorSmoothingInput
 export declare function applyTextureMeshColorSmoothing(values: TextureMeshValues, resolution: number, stride: number, webgl: WebGLContext, colorTexture?: Texture): void;
 export declare function applyTextureMeshOverpaintSmoothing(values: TextureMeshValues, resolution: number, stride: number, webgl: WebGLContext, colorTexture?: Texture): void;
 export declare function applyTextureMeshTransparencySmoothing(values: TextureMeshValues, resolution: number, stride: number, webgl: WebGLContext, colorTexture?: Texture): void;
+export declare function applyTextureMeshSubstanceSmoothing(values: TextureMeshValues, resolution: number, stride: number, webgl: WebGLContext, colorTexture?: Texture): void;
 export {};

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

@@ -5,7 +5,7 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyTextureMeshTransparencySmoothing = exports.applyTextureMeshOverpaintSmoothing = exports.applyTextureMeshColorSmoothing = exports.calcTextureMeshColorSmoothing = exports.ColorNormalizeSchema = exports.ColorAccumulateSchema = void 0;
+exports.applyTextureMeshSubstanceSmoothing = exports.applyTextureMeshTransparencySmoothing = exports.applyTextureMeshOverpaintSmoothing = exports.applyTextureMeshColorSmoothing = exports.calcTextureMeshColorSmoothing = exports.ColorNormalizeSchema = exports.ColorAccumulateSchema = void 0;
 var tslib_1 = require("tslib");
 var mol_util_1 = require("../../../mol-util");
 var renderable_1 = require("../../../mol-gl/renderable");
@@ -397,4 +397,36 @@ function applyTextureMeshTransparencySmoothing(values, resolution, stride, webgl
     mol_util_1.ValueCell.update(values.uTransparencyGridTransform, smoothingData.gridTransform);
 }
 exports.applyTextureMeshTransparencySmoothing = applyTextureMeshTransparencySmoothing;
+function isSupportedSubstanceType(x) {
+    return x === 'groupInstance';
+}
+function applyTextureMeshSubstanceSmoothing(values, resolution, stride, webgl, colorTexture) {
+    if (!isSupportedSubstanceType(values.dSubstanceType.ref.value))
+        return;
+    stride *= 3; // triple because TextureMesh is never indexed (no elements buffer)
+    if (!webgl.namedTextures[ColorSmoothingRgbName]) {
+        webgl.namedTextures[ColorSmoothingRgbName] = webgl.resources.texture('image-uint8', 'rgb', 'ubyte', 'nearest');
+    }
+    var colorData = webgl.namedTextures[ColorSmoothingRgbName];
+    colorData.load(values.tSubstance.ref.value);
+    var smoothingData = calcTextureMeshColorSmoothing({
+        vertexCount: values.uVertexCount.ref.value,
+        instanceCount: values.uInstanceCount.ref.value,
+        groupCount: values.uGroupCount.ref.value,
+        transformBuffer: values.aTransform.ref.value,
+        instanceBuffer: values.aInstance.ref.value,
+        positionTexture: values.tPosition.ref.value,
+        groupTexture: values.tGroup.ref.value,
+        colorData: colorData,
+        colorType: values.dSubstanceType.ref.value,
+        boundingSphere: values.boundingSphere.ref.value,
+        invariantBoundingSphere: values.invariantBoundingSphere.ref.value,
+    }, resolution, stride, webgl, colorTexture);
+    mol_util_1.ValueCell.updateIfChanged(values.dSubstanceType, smoothingData.type);
+    mol_util_1.ValueCell.update(values.tSubstanceGrid, smoothingData.texture);
+    mol_util_1.ValueCell.update(values.uSubstanceTexDim, smoothingData.gridTexDim);
+    mol_util_1.ValueCell.update(values.uSubstanceGridDim, smoothingData.gridDim);
+    mol_util_1.ValueCell.update(values.uSubstanceGridTransform, smoothingData.gridTransform);
+}
+exports.applyTextureMeshSubstanceSmoothing = applyTextureMeshSubstanceSmoothing;
 //# sourceMappingURL=color-smoothing.js.map

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

@@ -46,7 +46,11 @@ export declare namespace TextureMesh {
         ignoreLight: PD.BooleanParam;
         xrayShaded: PD.BooleanParam;
         alpha: PD.Numeric;
-        quality: PD.Select<"custom" | "auto" | "highest" | "higher" | "high" | "medium" | "low" | "lower" | "lowest">;
+        quality: PD.Select<"auto" | "medium" | "high" | "low" | "custom" | "highest" | "higher" | "lower" | "lowest">;
+        material: PD.Group<PD.Normalize<{
+            metalness: number;
+            roughness: number;
+        }>>;
     };
     type Params = typeof Params;
     const Utils: GeometryUtils<TextureMesh, Params>;

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

@@ -21,6 +21,7 @@ var texture_1 = require("../../../mol-gl/webgl/texture");
 var linear_algebra_1 = require("../../../mol-math/linear-algebra");
 var clipping_data_1 = require("../clipping-data");
 var location_1 = require("../../../mol-model/location");
+var substance_data_1 = require("../substance-data");
 var TextureMesh;
 (function (TextureMesh) {
     var DoubleBuffer = /** @class */ (function () {
@@ -107,11 +108,12 @@ var TextureMesh;
         var marker = (0, marker_data_1.createMarkers)(instanceCount * groupCount);
         var overpaint = (0, overpaint_data_1.createEmptyOverpaint)();
         var transparency = (0, transparency_data_1.createEmptyTransparency)();
+        var substance = (0, substance_data_1.createEmptySubstance)();
         var clipping = (0, clipping_data_1.createEmptyClipping)();
         var counts = { drawCount: textureMesh.vertexCount, vertexCount: textureMesh.vertexCount, groupCount: groupCount, instanceCount: instanceCount };
         var invariantBoundingSphere = geometry_1.Sphere3D.clone(textureMesh.boundingSphere);
         var boundingSphere = (0, util_1.calculateTransformBoundingSphere)(invariantBoundingSphere, transform.aTransform.ref.value, instanceCount);
-        return (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({ uGeoTexDim: textureMesh.geoTextureDim, tPosition: textureMesh.vertexTexture, tGroup: textureMesh.groupTexture, tNormal: textureMesh.normalTexture, boundingSphere: mol_util_1.ValueCell.create(boundingSphere), invariantBoundingSphere: mol_util_1.ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: mol_util_1.ValueCell.create(linear_algebra_1.Vec4.ofSphere(invariantBoundingSphere)) }, color), marker), overpaint), transparency), clipping), transform), base_1.BaseGeometry.createValues(props, counts)), { dDoubleSided: mol_util_1.ValueCell.create(props.doubleSided), dFlatShaded: mol_util_1.ValueCell.create(props.flatShaded), dFlipSided: mol_util_1.ValueCell.create(props.flipSided), dIgnoreLight: mol_util_1.ValueCell.create(props.ignoreLight), dXrayShaded: mol_util_1.ValueCell.create(props.xrayShaded), dGeoTexture: mol_util_1.ValueCell.create(true), meta: mol_util_1.ValueCell.create(textureMesh.meta) });
+        return (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({ uGeoTexDim: textureMesh.geoTextureDim, tPosition: textureMesh.vertexTexture, tGroup: textureMesh.groupTexture, tNormal: textureMesh.normalTexture, boundingSphere: mol_util_1.ValueCell.create(boundingSphere), invariantBoundingSphere: mol_util_1.ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: mol_util_1.ValueCell.create(linear_algebra_1.Vec4.ofSphere(invariantBoundingSphere)) }, color), marker), overpaint), transparency), substance), clipping), transform), base_1.BaseGeometry.createValues(props, counts)), { dDoubleSided: mol_util_1.ValueCell.create(props.doubleSided), dFlatShaded: mol_util_1.ValueCell.create(props.flatShaded), dFlipSided: mol_util_1.ValueCell.create(props.flipSided), dIgnoreLight: mol_util_1.ValueCell.create(props.ignoreLight), dXrayShaded: mol_util_1.ValueCell.create(props.xrayShaded), dGeoTexture: mol_util_1.ValueCell.create(true), meta: mol_util_1.ValueCell.create(textureMesh.meta) });
     }
     function createValuesSimple(textureMesh, props, colorValue, sizeValue, transform) {
         var s = base_1.BaseGeometry.createSimple(colorValue, sizeValue, transform);

package/lib/commonjs/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,6 +47,13 @@ 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">;

package/lib/commonjs/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,6 +63,13 @@ 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">;

package/lib/commonjs/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,6 +39,13 @@ 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">;

package/lib/commonjs/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,6 +44,13 @@ 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">;

package/lib/commonjs/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,6 +41,13 @@ 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">;

package/lib/commonjs/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,6 +40,13 @@ 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">;

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

@@ -12,8 +12,7 @@ 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");
-var points_1 = require("../../mol-geo/geometry/points/points");
-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', points_1.Points.StyleTypeNames) });
+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) {
     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 = {

package/lib/commonjs/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">;
@@ -196,6 +194,17 @@ export declare const TransparencySchema: {
 };
 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">;
@@ -206,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
@@ -216,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">;
@@ -241,6 +253,13 @@ 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">;

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

@@ -5,7 +5,7 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseSchema = exports.ClippingSchema = exports.TransparencySchema = exports.OverpaintSchema = exports.MarkerSchema = exports.SizeSchema = exports.ColorSchema = exports.InternalSchema = exports.GlobalTextureSchema = exports.GlobalUniformSchema = exports.ValueSpec = exports.DefineSpec = exports.ElementsSpec = exports.TextureSpec = exports.UniformSpec = exports.AttributeSpec = exports.getValueVersions = exports.splitValues = void 0;
+exports.BaseSchema = exports.ClippingSchema = exports.SubstanceSchema = exports.TransparencySchema = exports.OverpaintSchema = exports.MarkerSchema = exports.SizeSchema = exports.ColorSchema = exports.InternalSchema = exports.GlobalTextureSchema = exports.GlobalUniformSchema = exports.ValueSpec = exports.DefineSpec = exports.ElementsSpec = exports.TextureSpec = exports.UniformSpec = exports.AttributeSpec = exports.getValueVersions = exports.splitValues = void 0;
 var tslib_1 = require("tslib");
 function splitValues(schema, values) {
     var attributeValues = {};
@@ -97,14 +97,9 @@ exports.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'),
@@ -171,6 +166,15 @@ exports.TransparencySchema = {
     tTransparencyGrid: TextureSpec('texture', 'alpha', 'ubyte', 'linear'),
     dTransparencyType: DefineSpec('string', ['groupInstance', 'volumeInstance']),
 };
+exports.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']),
+};
 exports.ClippingSchema = {
     dClipObjectCount: DefineSpec('number'),
     dClipVariant: DefineSpec('string', ['instance', 'pixel']),
@@ -178,7 +182,7 @@ exports.ClippingSchema = {
     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)({}, exports.ColorSchema), exports.MarkerSchema), exports.OverpaintSchema), exports.TransparencySchema), exports.ClippingSchema), { 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'), aInstance: AttributeSpec('float32', 1, 1), 
     /**
      * final per-instance transform calculated for instance `i` as
      * `aTransform[i] = matrix * transform[i] * extraTransform[i]`
@@ -187,7 +191,7 @@ exports.BaseSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__a
     /**
      * 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/commonjs/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,6 +44,13 @@ 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">;

package/lib/commonjs/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,6 +51,13 @@ 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">;

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

@@ -18,9 +18,12 @@ export declare const TextureMeshSchema: {
     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">;
@@ -39,6 +42,13 @@ export declare const TextureMeshSchema: {
     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">;

package/lib/commonjs/mol-gl/renderer.d.ts

@@ -6,6 +6,7 @@
 import { ICamera } from '../mol-canvas3d/camera';
 import { Scene } from './scene';
 import { WebGLContext } from './webgl/context';
+import { Color } from '../mol-util/color';
 import { GraphicsRenderVariant } from './webgl/render-item';
 import { ParamDefinition as PD } from '../mol-util/param-definition';
 import { Clipping } from '../mol-theme/clipping';
@@ -59,13 +60,14 @@ export declare const RendererParams: {
     selectStrength: PD.Numeric;
     markerPriority: PD.Select<number>;
     xrayEdgeFalloff: PD.Numeric;
-    style: PD.Mapped<PD.NamedParams<PD.Normalize<unknown>, "metallic"> | PD.NamedParams<PD.Normalize<{
-        lightIntensity: number;
-        ambientIntensity: number;
-        metalness: number;
-        roughness: number;
-        reflectivity: number;
-    }>, "custom"> | PD.NamedParams<PD.Normalize<unknown>, "matte"> | PD.NamedParams<PD.Normalize<unknown>, "flat"> | PD.NamedParams<PD.Normalize<unknown>, "glossy"> | PD.NamedParams<PD.Normalize<unknown>, "plastic">>;
+    light: PD.ObjectList<PD.Normalize<{
+        inclination: number;
+        azimuth: number;
+        color: Color;
+        intensity: number;
+    }>>;
+    ambientColor: PD.Color;
+    ambientIntensity: PD.Numeric;
     clip: PD.Group<PD.Normalize<{
         variant: Clipping.Variant;
         objects: PD.Normalize<{
@@ -78,14 +80,6 @@ export declare const RendererParams: {
     }>>;
 };
 export declare type RendererProps = PD.Values<typeof RendererParams>;
-export declare type Style = {
-    lightIntensity: number;
-    ambientIntensity: number;
-    metalness: number;
-    roughness: number;
-    reflectivity: number;
-};
-export declare function getStyle(props: RendererProps['style']): Style;
 declare namespace Renderer {
     function create(ctx: WebGLContext, props?: Partial<RendererProps>): Renderer;
 }