molstar 2.3.8 → 3.0.0-dev.0

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/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/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 = {

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

@@ -1 +1 @@
-{"version":3,"file":"texture-mesh.js","sourceRoot":"","sources":["../../../src/mol-gl/renderable/texture-mesh.ts"],"names":[],"mappings":"AAAA;;;;GAIG;;AAEH,OAAO,EAA+B,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAE9E,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,UAAU,EAAU,cAAc,EAAkB,WAAW,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC9J,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,CAAC,IAAM,iBAAiB,yBACvB,UAAU,KACb,UAAU,EAAE,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,EACzC,SAAS,EAAE,WAAW,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,EAC5D,MAAM,EAAE,WAAW,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,EAC3D,OAAO,EAAE,WAAW,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,EAE1D,WAAW,EAAE,UAAU,CAAC,SAAS,CAAC,EAClC,YAAY,EAAE,UAAU,CAAC,SAAS,CAAC,EACnC,UAAU,EAAE,UAAU,CAAC,SAAS,CAAC,EACjC,YAAY,EAAE,UAAU,CAAC,SAAS,CAAC,EACnC,WAAW,EAAE,UAAU,CAAC,SAAS,CAAC,EAClC,WAAW,EAAE,UAAU,CAAC,SAAS,CAAC,GACrC,CAAC;AAIF,MAAM,UAAU,qBAAqB,CAAC,GAAiB,EAAE,EAAU,EAAE,MAAyB,EAAE,KAAsB,EAAE,UAAkB;IACtI,IAAM,MAAM,2CAAQ,mBAAmB,GAAK,mBAAmB,GAAK,cAAc,GAAK,iBAAiB,CAAE,CAAC;IAC3G,IAAM,cAAc,GAAmB;QACnC,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;KAClC,CAAC;IACF,IAAM,UAAU,GAAG,cAAc,CAAC;IAClC,IAAM,UAAU,GAAG,wBAAwB,CAAC,GAAG,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,wBAAO,MAAM,GAAK,cAAc,GAAI,UAAU,CAAC,CAAC;IAEhI,OAAO,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;AACvD,CAAC"}
+{"version":3,"file":"texture-mesh.js","sourceRoot":"","sources":["../../../src/mol-gl/renderable/texture-mesh.ts"],"names":[],"mappings":"AAAA;;;;GAIG;;AAEH,OAAO,EAA+B,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAE9E,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,UAAU,EAAU,cAAc,EAAkB,WAAW,EAAE,WAAW,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACzK,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,CAAC,IAAM,iBAAiB,yBACvB,UAAU,KACb,UAAU,EAAE,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,EACzC,SAAS,EAAE,WAAW,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,EAC5D,MAAM,EAAE,WAAW,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,EAC3D,OAAO,EAAE,WAAW,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,EAE1D,WAAW,EAAE,UAAU,CAAC,SAAS,CAAC,EAClC,YAAY,EAAE,UAAU,CAAC,SAAS,CAAC,EACnC,UAAU,EAAE,UAAU,CAAC,SAAS,CAAC,EACjC,YAAY,EAAE,UAAU,CAAC,SAAS,CAAC,EACnC,WAAW,EAAE,UAAU,CAAC,SAAS,CAAC,EAClC,WAAW,EAAE,UAAU,CAAC,SAAS,CAAC,EAClC,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,GAC7B,CAAC;AAIF,MAAM,UAAU,qBAAqB,CAAC,GAAiB,EAAE,EAAU,EAAE,MAAyB,EAAE,KAAsB,EAAE,UAAkB;IACtI,IAAM,MAAM,2CAAQ,mBAAmB,GAAK,mBAAmB,GAAK,cAAc,GAAK,iBAAiB,CAAE,CAAC;IAC3G,IAAM,cAAc,GAAmB;QACnC,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;KAClC,CAAC;IACF,IAAM,UAAU,GAAG,cAAc,CAAC;IAClC,IAAM,UAAU,GAAG,wBAAwB,CAAC,GAAG,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,wBAAO,MAAM,GAAK,cAAc,GAAI,UAAU,CAAC,CAAC;IAEhI,OAAO,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;AACvD,CAAC"}

package/lib/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<{
-        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>, "metallic"> | 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;
 }

package/lib/mol-gl/renderer.js

@@ -16,7 +16,6 @@ import { arrayMapUpsert } from '../mol-util/array';
 import { clamp } from '../mol-math/interpolate';
 export var RendererParams = {
     backgroundColor: PD.Color(Color(0x000000), { description: 'Background color of the 3D canvas' }),
-    // the following are general 'material' parameters
     pickingAlphaThreshold: PD.Numeric(0.5, { min: 0.0, max: 1.0, step: 0.01 }, { description: 'The minimum opacity value needed for an object to be pickable.' }),
     interiorDarkening: PD.Numeric(0.5, { min: 0.0, max: 1.0, step: 0.01 }),
     interiorColorFlag: PD.Boolean(true, { label: 'Use Interior Color' }),
@@ -27,20 +26,19 @@ export var RendererParams = {
     selectStrength: PD.Numeric(0.7, { min: 0.0, max: 1.0, step: 0.1 }),
     markerPriority: PD.Select(1, [[1, 'Highlight'], [2, 'Select']]),
     xrayEdgeFalloff: PD.Numeric(1, { min: 0.0, max: 3.0, step: 0.1 }),
-    style: PD.MappedStatic('matte', {
-        custom: PD.Group({
-            lightIntensity: PD.Numeric(0.6, { min: 0.0, max: 1.0, step: 0.01 }),
-            ambientIntensity: PD.Numeric(0.4, { min: 0.0, max: 1.0, step: 0.01 }),
-            metalness: PD.Numeric(0.0, { min: 0.0, max: 1.0, step: 0.01 }),
-            roughness: PD.Numeric(1.0, { min: 0.0, max: 1.0, step: 0.01 }),
-            reflectivity: PD.Numeric(0.5, { min: 0.0, max: 1.0, step: 0.01 }),
-        }, { isExpanded: true }),
-        flat: PD.Group({}),
-        matte: PD.Group({}),
-        glossy: PD.Group({}),
-        metallic: PD.Group({}),
-        plastic: PD.Group({}),
-    }, { label: 'Lighting', description: 'Style in which the 3D scene is rendered/lighted' }),
+    light: PD.ObjectList({
+        inclination: PD.Numeric(180, { min: 0, max: 180, step: 1 }),
+        azimuth: PD.Numeric(0, { min: 0, max: 360, step: 1 }),
+        color: PD.Color(Color.fromNormalizedRgb(1.0, 1.0, 1.0)),
+        intensity: PD.Numeric(0.6, { min: 0.0, max: 1.0, step: 0.01 }),
+    }, function (o) { return Color.toHexString(o.color); }, { defaultValue: [{
+                inclination: 180,
+                azimuth: 0,
+                color: Color.fromNormalizedRgb(1.0, 1.0, 1.0),
+                intensity: 0.6
+            }] }),
+    ambientColor: PD.Color(Color.fromNormalizedRgb(1.0, 1.0, 1.0)),
+    ambientIntensity: PD.Numeric(0.4, { min: 0.0, max: 1.0, step: 0.01 }),
     clip: PD.Group({
         variant: PD.Select('instance', PD.arrayToOptions(['instance', 'pixel'])),
         objects: PD.ObjectList({
@@ -55,36 +53,21 @@ export var RendererParams = {
         }, function (o) { return stringToWords(o.type); })
     })
 };
-export function getStyle(props) {
-    switch (props.name) {
-        case 'custom':
-            return props.params;
-        case 'flat':
-            return {
-                lightIntensity: 0, ambientIntensity: 1,
-                metalness: 0, roughness: 0.4, reflectivity: 0.5
-            };
-        case 'matte':
-            return {
-                lightIntensity: 0.7, ambientIntensity: 0.3,
-                metalness: 0, roughness: 1, reflectivity: 0.5
-            };
-        case 'glossy':
-            return {
-                lightIntensity: 0.7, ambientIntensity: 0.3,
-                metalness: 0, roughness: 0.4, reflectivity: 0.5
-            };
-        case 'metallic':
-            return {
-                lightIntensity: 0.7, ambientIntensity: 0.7,
-                metalness: 0.6, roughness: 0.6, reflectivity: 0.5
-            };
-        case 'plastic':
-            return {
-                lightIntensity: 0.7, ambientIntensity: 0.3,
-                metalness: 0, roughness: 0.2, reflectivity: 0.5
-            };
+var tmpDir = Vec3();
+var tmpColor = Vec3();
+function getLight(props, light) {
+    var _a = light || {
+        direction: (new Array(5 * 3)).fill(0),
+        color: (new Array(5 * 3)).fill(0),
+    }, direction = _a.direction, color = _a.color;
+    for (var i = 0, il = props.length; i < il; ++i) {
+        var p = props[i];
+        Vec3.directionFromSpherical(tmpDir, degToRad(p.inclination), degToRad(p.azimuth), 1);
+        Vec3.toArray(tmpDir, direction, i * 3);
+        Vec3.scale(tmpColor, Color.toVec3Normalized(tmpColor, p.color), p.intensity);
+        Vec3.toArray(tmpColor, color, i * 3);
     }
+    return { count: props.length, direction: direction, color: color };
 }
 var tmpQuat = Quat();
 function getClip(props, clip) {
@@ -114,7 +97,7 @@ var Renderer;
         if (props === void 0) { props = {}; }
         var gl = ctx.gl, state = ctx.state, stats = ctx.stats, fragDepth = ctx.extensions.fragDepth;
         var p = PD.merge(RendererParams, PD.getDefaultValues(RendererParams), props);
-        var style = getStyle(p.style);
+        var light = getLight(p.light);
         var clip = getClip(p.clip);
         var viewport = Viewport();
         var drawingBufferSize = Vec2.create(gl.drawingBufferWidth, gl.drawingBufferHeight);
@@ -133,6 +116,8 @@ var Renderer;
         var invModelViewProjection = Mat4();
         var cameraDir = Vec3();
         var viewOffset = Vec2();
+        var ambientColor = Vec3();
+        Vec3.scale(ambientColor, Color.toArrayNormalized(p.ambientColor, ambientColor, 0), p.ambientIntensity);
         var globalUniforms = {
             uModel: ValueCell.create(Mat4.identity()),
             uView: ValueCell.create(view),
@@ -163,12 +148,9 @@ var Renderer;
             uClipObjectPosition: ValueCell.create(clip.objects.position),
             uClipObjectRotation: ValueCell.create(clip.objects.rotation),
             uClipObjectScale: ValueCell.create(clip.objects.scale),
-            // the following are general 'material' uniforms
-            uLightIntensity: ValueCell.create(style.lightIntensity),
-            uAmbientIntensity: ValueCell.create(style.ambientIntensity),
-            uMetalness: ValueCell.create(style.metalness),
-            uRoughness: ValueCell.create(style.roughness),
-            uReflectivity: ValueCell.create(style.reflectivity),
+            uLightDirection: ValueCell.create(light.direction),
+            uLightColor: ValueCell.create(light.color),
+            uAmbientColor: ValueCell.create(ambientColor),
             uPickingAlphaThreshold: ValueCell.create(p.pickingAlphaThreshold),
             uInteriorDarkening: ValueCell.create(p.interiorDarkening),
             uInteriorColorFlag: ValueCell.create(p.interiorColorFlag),
@@ -203,6 +185,10 @@ var Renderer;
                     definesNeedUpdate = true;
                 }
             }
+            if (r.values.dLightCount.ref.value !== light.count) {
+                ValueCell.update(r.values.dLightCount, light.count);
+                definesNeedUpdate = true;
+            }
             if (definesNeedUpdate)
                 r.update();
             var program = r.getProgram(variant);
@@ -217,6 +203,9 @@ var Renderer;
                 globalUniformsNeedUpdate = false;
             }
             if (r.values.dRenderMode) { // indicates direct-volume
+                if ((variant[0] === 'p' || variant === 'depth') && r.values.dRenderMode.ref.value === 'volume') {
+                    return; // no picking/depth in volume mode
+                }
                 // culling done in fragment shader
                 state.disable(gl.CULL_FACE);
                 state.frontFace(gl.CCW);
@@ -531,14 +520,21 @@ var Renderer;
                     p.xrayEdgeFalloff = props.xrayEdgeFalloff;
                     ValueCell.update(globalUniforms.uXrayEdgeFalloff, p.xrayEdgeFalloff);
                 }
-                if (props.style !== undefined) {
-                    p.style = props.style;
-                    Object.assign(style, getStyle(props.style));
-                    ValueCell.updateIfChanged(globalUniforms.uLightIntensity, style.lightIntensity);
-                    ValueCell.updateIfChanged(globalUniforms.uAmbientIntensity, style.ambientIntensity);
-                    ValueCell.updateIfChanged(globalUniforms.uMetalness, style.metalness);
-                    ValueCell.updateIfChanged(globalUniforms.uRoughness, style.roughness);
-                    ValueCell.updateIfChanged(globalUniforms.uReflectivity, style.reflectivity);
+                if (props.light !== undefined && !deepEqual(props.light, p.light)) {
+                    p.light = props.light;
+                    Object.assign(light, getLight(props.light, light));
+                    ValueCell.update(globalUniforms.uLightDirection, light.direction);
+                    ValueCell.update(globalUniforms.uLightColor, light.color);
+                }
+                if (props.ambientColor !== undefined && props.ambientColor !== p.ambientColor) {
+                    p.ambientColor = props.ambientColor;
+                    Vec3.scale(ambientColor, Color.toArrayNormalized(p.ambientColor, ambientColor, 0), p.ambientIntensity);
+                    ValueCell.update(globalUniforms.uAmbientColor, ambientColor);
+                }
+                if (props.ambientIntensity !== undefined && props.ambientIntensity !== p.ambientIntensity) {
+                    p.ambientIntensity = props.ambientIntensity;
+                    Vec3.scale(ambientColor, Color.toArrayNormalized(p.ambientColor, ambientColor, 0), p.ambientIntensity);
+                    ValueCell.update(globalUniforms.uAmbientColor, ambientColor);
                 }
                 if (props.clip !== undefined && !deepEqual(props.clip, p.clip)) {
                     p.clip = props.clip;