molstar 2.4.1 → 3.0.0-dev.0

package/lib/commonjs/mol-theme/substance.js

@@ -0,0 +1,132 @@
+"use strict";
+/**
+ * Copyright (c) 2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author Alexander Rose <alexander.rose@weirdbyte.de>
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Substance = void 0;
+var loci_1 = require("../mol-model/loci");
+var structure_1 = require("../mol-model/structure");
+var script_1 = require("../mol-script/script");
+var material_1 = require("../mol-util/material");
+function Substance(layers) {
+    return { layers: layers };
+}
+exports.Substance = Substance;
+(function (Substance) {
+    Substance.Empty = { layers: [] };
+    function areEqual(sA, sB) {
+        if (sA.layers.length === 0 && sB.layers.length === 0)
+            return true;
+        if (sA.layers.length !== sB.layers.length)
+            return false;
+        for (var i = 0, il = sA.layers.length; i < il; ++i) {
+            if (sA.layers[i].clear !== sB.layers[i].clear)
+                return false;
+            if (sA.layers[i].material !== sB.layers[i].material)
+                return false;
+            if (!loci_1.Loci.areEqual(sA.layers[i].loci, sB.layers[i].loci))
+                return false;
+        }
+        return true;
+    }
+    Substance.areEqual = areEqual;
+    function isEmpty(overpaint) {
+        return overpaint.layers.length === 0;
+    }
+    Substance.isEmpty = isEmpty;
+    function remap(substance, structure) {
+        var layers = [];
+        for (var _i = 0, _a = substance.layers; _i < _a.length; _i++) {
+            var layer = _a[_i];
+            var loci = layer.loci, material = layer.material, clear = layer.clear;
+            loci = structure_1.StructureElement.Loci.remap(loci, structure);
+            if (!structure_1.StructureElement.Loci.isEmpty(loci)) {
+                layers.push({ loci: loci, material: material, clear: clear });
+            }
+        }
+        return { layers: layers };
+    }
+    Substance.remap = remap;
+    function merge(substance) {
+        if (isEmpty(substance))
+            return substance;
+        var structure = substance.layers[0].loci.structure;
+        var map = new Map();
+        var shadowed = structure_1.StructureElement.Loci.none(structure);
+        for (var i = 0, il = substance.layers.length; i < il; ++i) {
+            var _a = substance.layers[il - i - 1], loci = _a.loci, material = _a.material, clear = _a.clear; // process from end
+            loci = structure_1.StructureElement.Loci.subtract(loci, shadowed);
+            shadowed = structure_1.StructureElement.Loci.union(loci, shadowed);
+            if (!structure_1.StructureElement.Loci.isEmpty(loci)) {
+                var materialOrClear = clear ? -1 : material;
+                if (map.has(materialOrClear)) {
+                    loci = structure_1.StructureElement.Loci.union(loci, map.get(materialOrClear));
+                }
+                map.set(materialOrClear, loci);
+            }
+        }
+        var layers = [];
+        map.forEach(function (loci, materialOrClear) {
+            var clear = materialOrClear === -1;
+            var material = clear ? (0, material_1.Material)(0) : materialOrClear;
+            layers.push({ loci: loci, material: material, clear: clear });
+        });
+        return { layers: layers };
+    }
+    Substance.merge = merge;
+    function filter(substance, filter) {
+        if (isEmpty(substance))
+            return substance;
+        var structure = substance.layers[0].loci.structure;
+        var layers = [];
+        for (var _i = 0, _a = substance.layers; _i < _a.length; _i++) {
+            var layer = _a[_i];
+            var loci = layer.loci, material = layer.material, clear = layer.clear;
+            // filter by first map to the `filter` structure and
+            // then map back to the original structure of the substance loci
+            var filtered = structure_1.StructureElement.Loci.remap(loci, filter);
+            loci = structure_1.StructureElement.Loci.remap(filtered, structure);
+            if (!structure_1.StructureElement.Loci.isEmpty(loci)) {
+                layers.push({ loci: loci, material: material, clear: clear });
+            }
+        }
+        return { layers: layers };
+    }
+    Substance.filter = filter;
+    function ofScript(scriptLayers, structure) {
+        var layers = [];
+        for (var i = 0, il = scriptLayers.length; i < il; ++i) {
+            var _a = scriptLayers[i], script = _a.script, material = _a.material, clear = _a.clear;
+            var loci = script_1.Script.toLoci(script, structure);
+            if (!structure_1.StructureElement.Loci.isEmpty(loci)) {
+                layers.push({ loci: loci, material: material, clear: clear });
+            }
+        }
+        return { layers: layers };
+    }
+    Substance.ofScript = ofScript;
+    function ofBundle(bundleLayers, structure) {
+        var layers = [];
+        for (var i = 0, il = bundleLayers.length; i < il; ++i) {
+            var _a = bundleLayers[i], bundle = _a.bundle, material = _a.material, clear = _a.clear;
+            var loci = structure_1.StructureElement.Bundle.toLoci(bundle, structure.root);
+            layers.push({ loci: loci, material: material, clear: clear });
+        }
+        return { layers: layers };
+    }
+    Substance.ofBundle = ofBundle;
+    function toBundle(overpaint) {
+        var layers = [];
+        for (var i = 0, il = overpaint.layers.length; i < il; ++i) {
+            var _a = overpaint.layers[i], loci = _a.loci, material = _a.material, clear = _a.clear;
+            var bundle = structure_1.StructureElement.Bundle.fromLoci(loci);
+            layers.push({ bundle: bundle, material: material, clear: clear });
+        }
+        return { layers: layers };
+    }
+    Substance.toBundle = toBundle;
+})(Substance || (Substance = {}));
+exports.Substance = Substance;
+//# sourceMappingURL=substance.js.map

package/lib/commonjs/mol-theme/substance.js.map

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

package/lib/commonjs/mol-util/material.d.ts

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author Alexander Rose <alexander.rose@weirdbyte.de>
+ */
+import { NumberArray } from './type-helpers';
+import { ParamDefinition as PD } from './param-definition';
+/** Material properties expressed as a single number */
+export declare type Material = {
+    readonly '@type': 'material';
+} & number;
+export declare function Material(hex: number): Material;
+export declare namespace Material {
+    function fromNormalized(metalness: number, roughness: number): Material;
+    function fromObjectNormalized(v: {
+        metalness: number;
+        roughness: number;
+    }): Material;
+    function toObjectNormalized(material: Material, fractionDigits?: number): {
+        metalness: number;
+        roughness: number;
+    };
+    function toArray(material: Material, array: NumberArray, offset: number): NumberArray;
+    function toString(material: Material): string;
+    function getParam(info?: {
+        isExpanded?: boolean;
+        isFlat?: boolean;
+    }): PD.Converted<Material, PD.Normalize<{
+        metalness: number;
+        roughness: number;
+    }>>;
+}

package/lib/commonjs/mol-util/material.js

@@ -0,0 +1,51 @@
+"use strict";
+/**
+ * Copyright (c) 2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author Alexander Rose <alexander.rose@weirdbyte.de>
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Material = void 0;
+var param_definition_1 = require("./param-definition");
+var number_1 = require("./number");
+function Material(hex) { return hex; }
+exports.Material = Material;
+(function (Material) {
+    function fromNormalized(metalness, roughness) {
+        return (((metalness * 255) << 16) | ((roughness * 255) << 8));
+    }
+    Material.fromNormalized = fromNormalized;
+    function fromObjectNormalized(v) {
+        return fromNormalized(v.metalness, v.roughness);
+    }
+    Material.fromObjectNormalized = fromObjectNormalized;
+    function toObjectNormalized(material, fractionDigits) {
+        var metalness = (material >> 16 & 255) / 255;
+        var roughness = (material >> 8 & 255) / 255;
+        return {
+            metalness: fractionDigits ? (0, number_1.toFixed)(metalness, fractionDigits) : metalness,
+            roughness: fractionDigits ? (0, number_1.toFixed)(roughness, fractionDigits) : roughness
+        };
+    }
+    Material.toObjectNormalized = toObjectNormalized;
+    function toArray(material, array, offset) {
+        array[offset] = (material >> 16 & 255);
+        array[offset + 1] = (material >> 8 & 255);
+        return array;
+    }
+    Material.toArray = toArray;
+    function toString(material) {
+        var metalness = (material >> 16 & 255) / 255;
+        var roughness = (material >> 8 & 255) / 255;
+        return "M ".concat(metalness, " | R ").concat(roughness);
+    }
+    Material.toString = toString;
+    function getParam(info) {
+        return param_definition_1.ParamDefinition.Converted(function (v) { return toObjectNormalized(v, 2); }, function (v) { return fromObjectNormalized(v); }, param_definition_1.ParamDefinition.Group({
+            metalness: param_definition_1.ParamDefinition.Numeric(0, { min: 0, max: 1, step: 0.01 }),
+            roughness: param_definition_1.ParamDefinition.Numeric(1, { min: 0, max: 1, step: 0.01 }),
+        }, info));
+    }
+    Material.getParam = getParam;
+})(Material = exports.Material || (exports.Material = {}));
+//# sourceMappingURL=material.js.map

package/lib/commonjs/mol-util/material.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"material.js","sourceRoot":"","sources":["../../../src/mol-util/material.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAGH,uDAA2D;AAC3D,mCAAmC;AAKnC,SAAgB,QAAQ,CAAC,GAAW,IAAI,OAAO,GAAe,CAAC,CAAC,CAAC;AAAjE,4BAAiE;AAEjE,WAAiB,QAAQ;IACrB,SAAgB,cAAc,CAAC,SAAiB,EAAE,SAAiB;QAC/D,OAAO,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAa,CAAC;IAC9E,CAAC;IAFe,uBAAc,iBAE7B,CAAA;IAED,SAAgB,oBAAoB,CAAC,CAA2C;QAC5E,OAAO,cAAc,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC;IAFe,6BAAoB,uBAEnC,CAAA;IAED,SAAgB,kBAAkB,CAAC,QAAkB,EAAE,cAAuB;QAC1E,IAAM,SAAS,GAAG,CAAC,QAAQ,IAAI,EAAE,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;QAC/C,IAAM,SAAS,GAAG,CAAC,QAAQ,IAAI,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;QAC9C,OAAO;YACH,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,IAAA,gBAAO,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS;YAC1E,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,IAAA,gBAAO,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS;SAC7E,CAAC;IACN,CAAC;IAPe,2BAAkB,qBAOjC,CAAA;IAED,SAAgB,OAAO,CAAC,QAAkB,EAAE,KAAkB,EAAE,MAAc;QAC1E,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,GAAG,GAAG,CAAC,CAAC;QACvC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;QAC1C,OAAO,KAAK,CAAC;IACjB,CAAC;IAJe,gBAAO,UAItB,CAAA;IAED,SAAgB,QAAQ,CAAC,QAAkB;QACvC,IAAM,SAAS,GAAG,CAAC,QAAQ,IAAI,EAAE,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;QAC/C,IAAM,SAAS,GAAG,CAAC,QAAQ,IAAI,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;QAC9C,OAAO,YAAK,SAAS,kBAAQ,SAAS,CAAE,CAAC;IAC7C,CAAC;IAJe,iBAAQ,WAIvB,CAAA;IAED,SAAgB,QAAQ,CAAC,IAAiD;QACtE,OAAO,kCAAE,CAAC,SAAS,CACf,UAAC,CAAW,IAAK,OAAA,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,EAAxB,CAAwB,EACzC,UAAC,CAA2C,IAAK,OAAA,oBAAoB,CAAC,CAAC,CAAC,EAAvB,CAAuB,EACxE,kCAAE,CAAC,KAAK,CAAC;YACL,SAAS,EAAE,kCAAE,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YACxD,SAAS,EAAE,kCAAE,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;SAC3D,EAAE,IAAI,CAAC,CACX,CAAC;IACN,CAAC;IATe,iBAAQ,WASvB,CAAA;AACL,CAAC,EAxCgB,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAwCxB"}

package/lib/commonjs/mol-util/number.d.ts

@@ -23,3 +23,4 @@ export declare function getArrayDigitCount(xs: ArrayLike<number>, maxDigits: num
 export declare function isInteger(s: string): boolean;
 export declare function getPrecision(v: number): number;
 export declare function toPrecision(v: number, precision: number): number;
+export declare function toFixed(v: number, fractionDigits: number): number;

package/lib/commonjs/mol-util/number.js

@@ -6,7 +6,7 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toPrecision = exports.getPrecision = exports.isInteger = exports.getArrayDigitCount = exports.integerDigitCount = exports.getMantissaMultiplier = void 0;
+exports.toFixed = exports.toPrecision = exports.getPrecision = exports.isInteger = exports.getArrayDigitCount = exports.integerDigitCount = exports.getMantissaMultiplier = void 0;
 /**
  * Determine the number of digits in a floating point number
  * Find a number M such that round(M * v) - M * v <= delta.
@@ -78,4 +78,8 @@ function toPrecision(v, precision) {
     return parseFloat(v.toPrecision(precision));
 }
 exports.toPrecision = toPrecision;
+function toFixed(v, fractionDigits) {
+    return parseFloat(v.toFixed(fractionDigits));
+}
+exports.toFixed = toFixed;
 //# sourceMappingURL=number.js.map

package/lib/commonjs/mol-util/number.js.map

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

package/lib/extensions/anvil/behavior.d.ts

@@ -27,6 +27,7 @@ declare const MembraneOrientation3D: StateTransformer<PluginStateObject.Molecule
     sizeFactor: number;
     alpha: number;
     quality: "auto" | "medium" | "high" | "low" | "custom" | "highest" | "higher" | "lower" | "lowest";
+    material: import("../../mol-util/material").Material;
     sectorOpacity: number;
     doubleSided: boolean;
     flipSided: boolean;

package/lib/extensions/anvil/representation.d.ts

@@ -20,6 +20,10 @@ declare const BilayerPlanesParams: {
     xrayShaded: PD.BooleanParam;
     alpha: PD.Numeric;
     quality: PD.Select<"auto" | "medium" | "high" | "low" | "custom" | "highest" | "higher" | "lower" | "lowest">;
+    material: PD.Converted<import("../../mol-util/material").Material, PD.Normalize<{
+        metalness: number;
+        roughness: number;
+    }>>;
 };
 export declare type BilayerPlanesParams = typeof BilayerPlanesParams;
 export declare type BilayerPlanesProps = PD.Values<BilayerPlanesParams>;
@@ -32,6 +36,10 @@ declare const BilayerRimsParams: {
     sizeFactor: PD.Numeric;
     alpha: PD.Numeric;
     quality: PD.Select<"auto" | "medium" | "high" | "low" | "custom" | "highest" | "higher" | "lower" | "lowest">;
+    material: PD.Converted<import("../../mol-util/material").Material, PD.Normalize<{
+        metalness: number;
+        roughness: number;
+    }>>;
 };
 export declare type BilayerRimsParams = typeof BilayerRimsParams;
 export declare type BilayerRimsProps = PD.Values<BilayerRimsParams>;
@@ -45,6 +53,10 @@ export declare const MembraneOrientationParams: {
     sizeFactor: PD.Numeric;
     alpha: PD.Numeric;
     quality: PD.Select<"auto" | "medium" | "high" | "low" | "custom" | "highest" | "higher" | "lower" | "lowest">;
+    material: PD.Converted<import("../../mol-util/material").Material, PD.Normalize<{
+        metalness: number;
+        roughness: number;
+    }>>;
     sectorOpacity: PD.Numeric;
     doubleSided: PD.BooleanParam;
     flipSided: PD.BooleanParam;
@@ -64,6 +76,10 @@ export declare function getMembraneOrientationParams(ctx: ThemeRegistryContext,
     sizeFactor: PD.Numeric;
     alpha: PD.Numeric;
     quality: PD.Select<"auto" | "medium" | "high" | "low" | "custom" | "highest" | "higher" | "lower" | "lowest">;
+    material: PD.Converted<import("../../mol-util/material").Material, PD.Normalize<{
+        metalness: number;
+        roughness: number;
+    }>>;
     sectorOpacity: PD.Numeric;
     doubleSided: PD.BooleanParam;
     flipSided: PD.BooleanParam;
@@ -83,6 +99,10 @@ export declare const MembraneOrientationRepresentationProvider: StructureReprese
     sizeFactor: PD.Numeric;
     alpha: PD.Numeric;
     quality: PD.Select<"auto" | "medium" | "high" | "low" | "custom" | "highest" | "higher" | "lower" | "lowest">;
+    material: PD.Converted<import("../../mol-util/material").Material, PD.Normalize<{
+        metalness: number;
+        roughness: number;
+    }>>;
     sectorOpacity: PD.Numeric;
     doubleSided: PD.BooleanParam;
     flipSided: PD.BooleanParam;

package/lib/extensions/cellpack/representation.d.ts

@@ -45,6 +45,10 @@ export declare const MBParams: {
     ignoreLight: PD.BooleanParam;
     xrayShaded: PD.BooleanParam;
     alpha: PD.Numeric;
+    material: PD.Converted<import("../../mol-util/material").Material, PD.Normalize<{
+        metalness: number;
+        roughness: number;
+    }>>;
 };
 export declare type MBParams = typeof MBParams;
 export declare type UnitcellProps = PD.Values<MBParams>;

package/lib/extensions/dnatco/confal-pyramids/representation.d.ts

@@ -19,6 +19,10 @@ export declare const ConfalPyramidsParams: {
     xrayShaded: PD.BooleanParam;
     alpha: PD.Numeric;
     quality: PD.Select<"auto" | "medium" | "high" | "low" | "custom" | "highest" | "higher" | "lower" | "lowest">;
+    material: PD.Converted<import("../../../mol-util/material").Material, PD.Normalize<{
+        metalness: number;
+        roughness: number;
+    }>>;
 };
 export declare type ConfalPyramidsParams = typeof ConfalPyramidsParams;
 export declare function getConfalPyramidsParams(ctx: ThemeRegistryContext, structure: Structure): {
@@ -31,6 +35,10 @@ export declare function getConfalPyramidsParams(ctx: ThemeRegistryContext, struc
     xrayShaded: PD.BooleanParam;
     alpha: PD.Numeric;
     quality: PD.Select<"auto" | "medium" | "high" | "low" | "custom" | "highest" | "higher" | "lower" | "lowest">;
+    material: PD.Converted<import("../../../mol-util/material").Material, PD.Normalize<{
+        metalness: number;
+        roughness: number;
+    }>>;
 };
 export declare type ConfalPyramidsRepresentation = StructureRepresentation<ConfalPyramidsParams>;
 export declare function ConfalPyramidsRepresentation(ctx: RepresentationContext, getParams: RepresentationParamsGetter<Structure, ConfalPyramidsParams>): ConfalPyramidsRepresentation;
@@ -44,4 +52,8 @@ export declare const ConfalPyramidsRepresentationProvider: StructureRepresentati
     xrayShaded: PD.BooleanParam;
     alpha: PD.Numeric;
     quality: PD.Select<"auto" | "medium" | "high" | "low" | "custom" | "highest" | "higher" | "lower" | "lowest">;
+    material: PD.Converted<import("../../../mol-util/material").Material, PD.Normalize<{
+        metalness: number;
+        roughness: number;
+    }>>;
 }, "confal-pyramids">;

package/lib/extensions/geo-export/controls.js

@@ -4,7 +4,6 @@
  * @author Sukolsak Sakshuwong <sukolsak@stanford.edu>
  */
 import { __awaiter, __extends, __generator } from "tslib";
-import { getStyle } from '../../mol-gl/renderer';
 import { Box3D } from '../../mol-math/geometry';
 import { PluginComponent } from '../../mol-plugin-state/component';
 import { Task } from '../../mol-task';
@@ -44,21 +43,20 @@ var GeometryControls = /** @class */ (function (_super) {
     GeometryControls.prototype.exportGeometry = function () {
         var _this = this;
         var task = Task.create('Export Geometry', function (ctx) { return __awaiter(_this, void 0, void 0, function () {
-            var renderObjects, filename, style, boundingSphere, boundingBox, renderObjectExporter, i, il, blob, e_1;
-            var _a, _b, _c, _d;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
+            var renderObjects, filename, boundingSphere, boundingBox, renderObjectExporter, i, il, blob, e_1;
+            var _a, _b, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        _e.trys.push([0, 7, , 8]);
+                        _d.trys.push([0, 7, , 8]);
                         renderObjects = (_a = this.plugin.canvas3d) === null || _a === void 0 ? void 0 : _a.getRenderObjects();
                         filename = this.getFilename();
-                        style = getStyle((_b = this.plugin.canvas3d) === null || _b === void 0 ? void 0 : _b.props.renderer.style);
-                        boundingSphere = (_c = this.plugin.canvas3d) === null || _c === void 0 ? void 0 : _c.boundingSphereVisible;
+                        boundingSphere = (_b = this.plugin.canvas3d) === null || _b === void 0 ? void 0 : _b.boundingSphereVisible;
                         boundingBox = Box3D.fromSphere3D(Box3D(), boundingSphere);
                         renderObjectExporter = void 0;
                         switch (this.behaviors.params.value.format) {
                             case 'glb':
-                                renderObjectExporter = new GlbExporter(style, boundingBox);
+                                renderObjectExporter = new GlbExporter(boundingBox);
                                 break;
                             case 'obj':
                                 renderObjectExporter = new ObjExporter(filename, boundingBox);
@@ -67,33 +65,33 @@ var GeometryControls = /** @class */ (function (_super) {
                                 renderObjectExporter = new StlExporter(boundingBox);
                                 break;
                             case 'usdz':
-                                renderObjectExporter = new UsdzExporter(style, boundingBox, boundingSphere.radius);
+                                renderObjectExporter = new UsdzExporter(boundingBox, boundingSphere.radius);
                                 break;
                             default: throw new Error('Unsupported format.');
                         }
                         i = 0, il = renderObjects.length;
-                        _e.label = 1;
+                        _d.label = 1;
                     case 1:
                         if (!(i < il)) return [3 /*break*/, 5];
                         return [4 /*yield*/, ctx.update({ message: "Exporting object ".concat(i, "/").concat(il) })];
                     case 2:
-                        _e.sent();
-                        return [4 /*yield*/, renderObjectExporter.add(renderObjects[i], (_d = this.plugin.canvas3d) === null || _d === void 0 ? void 0 : _d.webgl, ctx)];
+                        _d.sent();
+                        return [4 /*yield*/, renderObjectExporter.add(renderObjects[i], (_c = this.plugin.canvas3d) === null || _c === void 0 ? void 0 : _c.webgl, ctx)];
                     case 3:
-                        _e.sent();
-                        _e.label = 4;
+                        _d.sent();
+                        _d.label = 4;
                     case 4:
                         ++i;
                         return [3 /*break*/, 1];
                     case 5: return [4 /*yield*/, renderObjectExporter.getBlob(ctx)];
                     case 6:
-                        blob = _e.sent();
+                        blob = _d.sent();
                         return [2 /*return*/, {
                                 blob: blob,
                                 filename: filename + '.' + renderObjectExporter.fileExtension
                             }];
                     case 7:
-                        e_1 = _e.sent();
+                        e_1 = _d.sent();
                         this.plugin.log.error('Error during geometry export');
                         throw e_1;
                     case 8: return [2 /*return*/];

package/lib/extensions/geo-export/controls.js.map

@@ -1 +1 @@
-{"version":3,"file":"controls.js","sourceRoot":"","sources":["../../../src/extensions/geo-export/controls.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"controls.js","sourceRoot":"","sources":["../../../src/extensions/geo-export/controls.ts"],"names":[],"mappings":"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"}

package/lib/extensions/geo-export/glb-exporter.d.ts

@@ -4,7 +4,6 @@
  * @author Sukolsak Sakshuwong <sukolsak@stanford.edu>
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
-import { Style } from '../../mol-gl/renderer';
 import { Box3D } from '../../mol-math/geometry';
 import { RuntimeContext } from '../../mol-task';
 import { MeshExporter, AddMeshInput } from './mesh-exporter';
@@ -12,10 +11,11 @@ export declare type GlbData = {
     glb: Uint8Array;
 };
 export declare class GlbExporter extends MeshExporter<GlbData> {
-    private style;
     readonly fileExtension = "glb";
     private nodes;
     private meshes;
+    private materials;
+    private materialMap;
     private accessors;
     private bufferViews;
     private binaryBuffer;
@@ -25,10 +25,11 @@ export declare class GlbExporter extends MeshExporter<GlbData> {
     private addBuffer;
     private addGeometryBuffers;
     private addColorBuffer;
+    private addMaterial;
     protected addMeshWithColors(input: AddMeshInput): Promise<void>;
     getData(): Promise<{
         glb: Uint8Array;
     }>;
     getBlob(ctx: RuntimeContext): Promise<Blob>;
-    constructor(style: Style, boundingBox: Box3D);
+    constructor(boundingBox: Box3D);
 }

package/lib/extensions/geo-export/glb-exporter.js

@@ -29,12 +29,13 @@ var JSON_PAD_CHAR = 0x20;
 var BIN_PAD_CHAR = 0x00;
 var GlbExporter = /** @class */ (function (_super) {
     __extends(GlbExporter, _super);
-    function GlbExporter(style, boundingBox) {
+    function GlbExporter(boundingBox) {
         var _this = _super.call(this) || this;
-        _this.style = style;
         _this.fileExtension = 'glb';
         _this.nodes = [];
         _this.meshes = [];
+        _this.materials = [];
+        _this.materialMap = new Map();
         _this.accessors = [];
         _this.bufferViews = [];
         _this.binaryBuffer = [];
@@ -134,9 +135,23 @@ var GlbExporter = /** @class */ (function (_super) {
         }
         return this.addBuffer(colorBuffer, UNSIGNED_BYTE, 'VEC4', vertexCount, ARRAY_BUFFER, undefined, undefined, true);
     };
+    GlbExporter.prototype.addMaterial = function (metalness, roughness) {
+        var hash = "".concat(metalness, "|").concat(roughness);
+        if (!this.materialMap.has(hash)) {
+            this.materialMap.set(hash, this.materials.length);
+            this.materials.push({
+                pbrMetallicRoughness: {
+                    baseColorFactor: [1, 1, 1, 1],
+                    metallicFactor: metalness,
+                    roughnessFactor: roughness
+                }
+            });
+        }
+        return this.materialMap.get(hash);
+    };
     GlbExporter.prototype.addMeshWithColors = function (input) {
         return __awaiter(this, void 0, void 0, function () {
-            var mesh, values, isGeoTexture, webgl, ctx, t, colorType, overpaintType, transparencyType, dTransparency, aTransform, instanceCount, interpolatedColors, stride, interpolatedOverpaint, stride, interpolatedTransparency, stride, sameGeometryBuffers, sameColorBuffer, vertexAccessorIndex, normalAccessorIndex, indexAccessorIndex, colorAccessorIndex, meshIndex, instanceIndex, _a, vertices, normals, indices, groups, vertexCount, drawCount, accessorIndices, node;
+            var mesh, values, isGeoTexture, webgl, ctx, t, colorType, overpaintType, transparencyType, dTransparency, aTransform, instanceCount, metalness, roughness, material, interpolatedColors, stride, interpolatedOverpaint, stride, interpolatedTransparency, stride, sameGeometryBuffers, sameColorBuffer, vertexAccessorIndex, normalAccessorIndex, indexAccessorIndex, colorAccessorIndex, meshIndex, instanceIndex, _a, vertices, normals, indices, groups, vertexCount, drawCount, accessorIndices, node;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -148,6 +163,9 @@ var GlbExporter = /** @class */ (function (_super) {
                         dTransparency = values.dTransparency.ref.value;
                         aTransform = values.aTransform.ref.value;
                         instanceCount = values.uInstanceCount.ref.value;
+                        metalness = values.uMetalness.ref.value;
+                        roughness = values.uRoughness.ref.value;
+                        material = this.addMaterial(metalness, roughness);
                         if (colorType === 'volume' || colorType === 'volumeInstance') {
                             stride = isGeoTexture ? 4 : 3;
                             interpolatedColors = GlbExporter.getInterpolatedColors(webgl, { vertices: mesh.vertices, vertexCount: mesh.vertexCount, values: values, stride: stride, colorType: colorType });
@@ -199,7 +217,7 @@ var GlbExporter = /** @class */ (function (_super) {
                                             COLOR_0: colorAccessorIndex
                                         },
                                         indices: indexAccessorIndex,
-                                        material: 0
+                                        material: material
                                     }]
                             });
                         }
@@ -240,13 +258,7 @@ var GlbExporter = /** @class */ (function (_super) {
                         }],
                     bufferViews: this.bufferViews,
                     accessors: this.accessors,
-                    materials: [{
-                            pbrMetallicRoughness: {
-                                baseColorFactor: [1, 1, 1, 1],
-                                metallicFactor: this.style.metalness,
-                                roughnessFactor: this.style.roughness
-                            }
-                        }]
+                    materials: this.materials
                 };
                 createChunk = function (chunkType, data, byteLength, padChar) {
                     var padding = null;