molstar 2.4.1 → 3.0.0-dev.0

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/points.js.map

@@ -1 +1 @@
-{"version":3,"file":"points.js","sourceRoot":"","sources":["../../../../src/mol-gl/renderable/points.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;AAEH,4CAA8E;AAE9E,oDAAgE;AAChE,mCAA+J;AAC/J,8CAAkD;AAClD,2CAA2C;AAC3C,+DAA8D;AAEjD,QAAA,YAAY,yEAClB,mBAAU,GACV,mBAAU,KACb,MAAM,EAAE,IAAA,sBAAa,EAAC,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,EACtC,SAAS,EAAE,IAAA,sBAAa,EAAC,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,EACzC,qBAAqB,EAAE,IAAA,mBAAU,EAAC,SAAS,CAAC,EAC5C,WAAW,EAAE,IAAA,mBAAU,EAAC,QAAQ,EAAE,eAAM,CAAC,cAAc,CAAC,IAC1D;AAIF,SAAgB,gBAAgB,CAAC,GAAiB,EAAE,EAAU,EAAE,MAAoB,EAAE,KAAsB,EAAE,UAAkB;IAC5H,IAAM,MAAM,+FAAQ,4BAAmB,GAAK,4BAAmB,GAAK,uBAAc,GAAK,oBAAY,CAAE,CAAC;IACtG,IAAM,cAAc,GAAmB;QACnC,SAAS,EAAE,oBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;KAClC,CAAC;IACF,IAAM,UAAU,GAAG,8BAAgB,CAAC;IACpC,IAAM,UAAU,GAAG,IAAA,sCAAwB,EAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,kDAAO,MAAM,GAAK,cAAc,GAAI,UAAU,CAAC,CAAC;IAC7H,OAAO,IAAA,6BAAgB,EAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;AACvD,CAAC;AARD,4CAQC"}
+{"version":3,"file":"points.js","sourceRoot":"","sources":["../../../../src/mol-gl/renderable/points.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;AAEH,4CAA8E;AAE9E,oDAAgE;AAChE,mCAA+J;AAC/J,8CAAkD;AAClD,2CAA2C;AAE9B,QAAA,YAAY,yEAClB,mBAAU,GACV,mBAAU,KACb,MAAM,EAAE,IAAA,sBAAa,EAAC,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,EACtC,SAAS,EAAE,IAAA,sBAAa,EAAC,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,EACzC,qBAAqB,EAAE,IAAA,mBAAU,EAAC,SAAS,CAAC,EAC5C,WAAW,EAAE,IAAA,mBAAU,EAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,IAClE;AAIF,SAAgB,gBAAgB,CAAC,GAAiB,EAAE,EAAU,EAAE,MAAoB,EAAE,KAAsB,EAAE,UAAkB;IAC5H,IAAM,MAAM,+FAAQ,4BAAmB,GAAK,4BAAmB,GAAK,uBAAc,GAAK,oBAAY,CAAE,CAAC;IACtG,IAAM,cAAc,GAAmB;QACnC,SAAS,EAAE,oBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;KAClC,CAAC;IACF,IAAM,UAAU,GAAG,8BAAgB,CAAC;IACpC,IAAM,UAAU,GAAG,IAAA,sCAAwB,EAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,kDAAO,MAAM,GAAK,cAAc,GAAI,UAAU,CAAC,CAAC;IAC7H,OAAO,IAAA,6BAAgB,EAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;AACvD,CAAC;AARD,4CAQC"}

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/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../src/mol-gl/renderable/schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../src/mol-gl/renderable/schema.ts"],"names":[],"mappings":"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"}

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>, "flat"> | 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>, "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;
 }