npm - molstar - Versions diffs - 2.3.3 → 2.3.8 - Mend

molstar 2.3.3 → 2.3.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1829) hide show

package/lib/commonjs/mol-geo/geometry/direct-volume/direct-volume.d.ts CHANGED Viewed

@@ -34,7 +34,7 @@ export declare namespace DirectVolume {
     function createRenderModeParam(stats?: Grid['stats']): PD.Mapped<PD.NamedParams<PD.Normalize<{
         controlPoints: Vec2[];
         list: {
-            kind: "interpolate" | "set";
+            kind: "set" | "interpolate";
             colors: import("../../../mol-util/color/color").ColorListEntry[];
         };
     }>, "volume"> | PD.NamedParams<PD.Normalize<{
@@ -56,7 +56,7 @@ export declare namespace DirectVolume {
         renderMode: PD.Mapped<PD.NamedParams<PD.Normalize<{
             controlPoints: Vec2[];
             list: {
-                kind: "interpolate" | "set";
+                kind: "set" | "interpolate";
                 colors: import("../../../mol-util/color/color").ColorListEntry[];
             };
         }>, "volume"> | PD.NamedParams<PD.Normalize<{
@@ -72,7 +72,7 @@ export declare namespace DirectVolume {
         stepsPerCell: PD.Numeric;
         jumpLength: PD.Numeric;
         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">;
     };
     type Params = typeof Params;
     const Utils: GeometryUtils<DirectVolume, Params>;

package/lib/commonjs/mol-geo/geometry/direct-volume/direct-volume.js CHANGED Viewed

@@ -10,6 +10,7 @@ var tslib_1 = require("tslib");
 var util_1 = require("../../../mol-data/util");
 var location_iterator_1 = require("../../../mol-geo/util/location-iterator");
 var util_2 = require("../../../mol-gl/renderable/util");
+var texture_1 = require("../../../mol-gl/webgl/texture");
 var geometry_1 = require("../../../mol-math/geometry");
 var linear_algebra_1 = require("../../../mol-math/linear-algebra");
 var mol_util_1 = require("../../../mol-util");
@@ -95,7 +96,15 @@ var DirectVolume;
         return directVolume;
     }
     function createEmpty(directVolume) {
-        return {}; // TODO
+        var bbox = (0, geometry_1.Box3D)();
+        var gridDimension = (0, linear_algebra_1.Vec3)();
+        var transform = linear_algebra_1.Mat4.identity();
+        var unitToCartn = linear_algebra_1.Mat4.identity();
+        var cellDim = (0, linear_algebra_1.Vec3)();
+        var texture = (0, texture_1.createNullTexture)();
+        var stats = volume_1.Grid.One.stats;
+        var packedGroup = false;
+        return create(bbox, gridDimension, transform, unitToCartn, cellDim, texture, stats, packedGroup, directVolume);
     }
     DirectVolume.createEmpty = createEmpty;
     function createRenderModeParam(stats) {

package/lib/commonjs/mol-geo/geometry/direct-volume/direct-volume.js.map CHANGED Viewed

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

package/lib/commonjs/mol-geo/geometry/image/image.d.ts CHANGED Viewed

@@ -16,7 +16,7 @@ export declare const InterpolationTypes: {
     bspline: string;
 };
 export declare type InterpolationTypes = keyof typeof InterpolationTypes;
-export declare const InterpolationTypeNames: ("nearest" | "catmulrom" | "mitchell" | "bspline")[];
+export declare const InterpolationTypeNames: ("nearest" | "bspline" | "catmulrom" | "mitchell")[];
 export { Image };
 interface Image {
     readonly kind: 'image';
@@ -31,9 +31,9 @@ declare namespace Image {
     function create(imageTexture: TextureImage<Uint8Array>, corners: Float32Array, groupTexture: TextureImage<Uint8Array>, image?: Image): Image;
     function createEmpty(image?: Image): Image;
     const Params: {
-        interpolation: PD.Select<"nearest" | "catmulrom" | "mitchell" | "bspline">;
+        interpolation: PD.Select<"nearest" | "bspline" | "catmulrom" | "mitchell">;
         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">;
     };
     type Params = typeof Params;
     const Utils: GeometryUtils<Image, Params>;

package/lib/commonjs/mol-geo/geometry/image/image.js CHANGED Viewed

@@ -86,7 +86,10 @@ var Image;
         return image;
     }
     function createEmpty(image) {
-        return {}; // TODO
+        var imageTexture = (0, util_2.createTextureImage)(0, 4, Uint8Array);
+        var corners = image ? image.cornerBuffer.ref.value : new Float32Array(8 * 3);
+        var groupTexture = (0, util_2.createTextureImage)(0, 4, Uint8Array);
+        return create(imageTexture, corners, groupTexture, image);
     }
     Image.createEmpty = createEmpty;
     Image.Params = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, base_1.BaseGeometry.Params), { interpolation: param_definition_1.ParamDefinition.Select('bspline', param_definition_1.ParamDefinition.objectToOptions(exports.InterpolationTypes)) });

package/lib/commonjs/mol-geo/geometry/image/image.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"image.js","sourceRoot":"","sources":["../../../../../src/mol-geo/geometry/image/image.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;AAEH,+CAAoD;AACpD,6EAA2E;AAE3E,~~wDAAiG~~;~~AACjG~~,uDAAsD;AACtD,mEAAoE;AAEpE,8CAA8C;AAE9C,uEAA2E;AAC3E,gCAAuC;AACvC,4CAA6C;AAE7C,8CAA+C;AAC/C,oDAAyD;AAEzD,0DAA+D;AAE/D,iDAAqD;AACrD,kDAAuD;AACvD,wDAA2D;AAC3D,qDAA6D;AAE7D,IAAM,WAAW,GAAG,IAAI,WAAW,CAAC;IAChC,CAAC,EAAE,CAAC,EAAE,CAAC;IACP,CAAC,EAAE,CAAC,EAAE,CAAC;CACV,CAAC,CAAC;AAEH,IAAM,OAAO,GAAG,IAAI,YAAY,CAAC;IAC7B,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AAEU,QAAA,kBAAkB,GAAG;IAC9B,SAAS,EAAE,SAAS;IACpB,WAAW,EAAE,mBAAmB;IAChC,UAAU,EAAE,kBAAkB;IAC9B,SAAS,EAAE,kBAAkB;CAChC,CAAC;AAEW,QAAA,sBAAsB,GAAG,MAAM,CAAC,IAAI,CAAC,0BAAkB,CAAyB,CAAC;AAgB9F,IAAU,KAAK,~~CAoJd~~;~~AApJD~~,WAAU,KAAK;IACX,SAAgB,MAAM,CAAC,YAAsC,EAAE,OAAqB,EAAE,YAAsC,EAAE,KAAa;QACvI,OAAO,KAAK,CAAC,CAAC;YACV,MAAM,CAAC,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;YACpD,QAAQ,CAAC,YAAY,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;IACtD,CAAC;IAJe,YAAM,SAIrB,CAAA;IAED,SAAS,QAAQ,CAAC,KAAY;QAC1B,OAAO,IAAA,iBAAU,EAAC;YACd,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO;SACjC,CAAC,CAAC;IACP,CAAC;IAED,SAAS,QAAQ,CAAC,YAAsC,EAAE,OAAqB,EAAE,YAAsC;QACnH,IAAM,cAAc,GAAG,IAAA,mBAAQ,GAAE,CAAC;QAClC,IAAI,WAAW,GAAG,CAAC,CAAC,CAAC;QAErB,IAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC;QACjC,IAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;QAEnC,IAAM,KAAK,GAAG;YACV,IAAI,EAAE,OAAgB;YACtB,YAAY,EAAE,oBAAS,CAAC,MAAM,CAAC,YAAY,CAAC;YAC5C,eAAe,EAAE,oBAAS,CAAC,MAAM,CAAC,qBAAI,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAC7D,YAAY,EAAE,oBAAS,CAAC,MAAM,CAAC,OAAO,CAAC;YACvC,YAAY,EAAE,oBAAS,CAAC,MAAM,CAAC,YAAY,CAAC;YAC5C,IAAI,cAAc;gBACd,IAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAChC,IAAI,OAAO,KAAK,WAAW,EAAE;oBACzB,IAAM,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;oBAC1D,mBAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;oBACjC,WAAW,GAAG,OAAO,CAAC;iBACzB;gBACD,OAAO,cAAc,CAAC;YAC1B,CAAC;SACJ,CAAC;QACF,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,SAAS,MAAM,CAAC,YAAsC,EAAE,OAAqB,EAAE,YAAsC,EAAE,KAAY;QAC/H,IAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC;QACjC,IAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;QAEnC,oBAAS,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QACnD,oBAAS,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,qBAAI,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;QAClG,oBAAS,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC9C,oBAAS,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QACnD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,SAAgB,WAAW,CAAC,KAAa;QACrC,OAAO,~~EAAW~~,CAAC,CAAC,~~OAAO~~;~~IAC~~/B,CAAC;~~IAFe~~,iBAAW,~~cAE1B~~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~~EApJS~~,KAAK,KAAL,KAAK,~~QAoJd~~;~~AAlKQ~~,sBAAK;~~AAoKd~~,EAAE;AAEF,SAAS,iBAAiB,CAAC,OAAqB;IAC5C,IAAM,MAAM,GAAG,IAAA,qBAAI,GAAE,CAAC;IACtB,IAAM,OAAO,GAAW,EAAE,CAAC;IAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE;QACjD,IAAM,CAAC,GAAG,qBAAI,CAAC,SAAS,CAAC,IAAA,qBAAI,GAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAChB,qBAAI,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;KAC/B;IACD,qBAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IAErD,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAgB,UAAO,EAAP,mBAAO,EAAP,qBAAO,EAAP,IAAO,EAAE;QAApB,IAAM,CAAC,gBAAA;QACR,IAAM,CAAC,GAAG,qBAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACnC,IAAI,CAAC,GAAG,MAAM;YAAE,MAAM,GAAG,CAAC,CAAC;KAC9B;IAED,IAAM,MAAM,GAAG,mBAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/C,mBAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAErC,OAAO,MAAM,CAAC;AAClB,CAAC"}
1	+ {"version":3,"file":"image.js","sourceRoot":"","sources":["../../../../../src/mol-geo/geometry/image/image.ts"],"names":[],"mappings":"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"}

package/lib/commonjs/mol-geo/geometry/lines/lines.d.ts CHANGED Viewed

@@ -40,7 +40,7 @@ export declare namespace Lines {
         sizeFactor: PD.Numeric;
         lineSizeAttenuation: 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">;
     };
     type Params = typeof Params;
     const Utils: GeometryUtils<Lines, Params>;

package/lib/commonjs/mol-geo/geometry/lines/lines.js CHANGED Viewed

@@ -122,7 +122,7 @@ var Lines;
     }
     Lines.transform = transform;
     //
-    Lines.Params = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, base_1.BaseGeometry.Params), { sizeFactor: param_definition_1.ParamDefinition.Numeric(1.5, { min: 0, max: 10, step: 0.1 }), lineSizeAttenuation: param_definition_1.ParamDefinition.Boolean(false) });
+    Lines.Params = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, base_1.BaseGeometry.Params), { sizeFactor: param_definition_1.ParamDefinition.Numeric(3, { min: 0, max: 10, step: 0.1 }), lineSizeAttenuation: param_definition_1.ParamDefinition.Boolean(false) });
     Lines.Utils = {
         Params: Lines.Params,
         createEmpty: createEmpty,

package/lib/commonjs/mol-geo/geometry/lines/lines.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"lines.js","sourceRoot":"","sources":["../../../../../src/mol-geo/geometry/lines/lines.ts"],"names":[],"mappings":"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~~GAAG~~,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,~~EAC3D~~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"}
1	+ {"version":3,"file":"lines.js","sourceRoot":"","sources":["../../../../../src/mol-geo/geometry/lines/lines.ts"],"names":[],"mappings":"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"}

package/lib/commonjs/mol-geo/geometry/mesh/builder/sheet.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author David Sehnal <david.sehnal@gmail.com>

package/lib/commonjs/mol-geo/geometry/mesh/builder/sheet.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2018-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author David Sehnal <david.sehnal@gmail.com>
@@ -36,7 +36,7 @@ var v3cross = linear_algebra_1.Vec3.cross;
 var v3set = linear_algebra_1.Vec3.set;
 var caAdd3 = util_1.ChunkedArray.add3;
 var caAdd = util_1.ChunkedArray.add;
-function addCap(offset, state, controlPoints, normalVectors, binormalVectors, width, leftHeight, rightHeight) {
+function addCap(offset, state, controlPoints, normalVectors, binormalVectors, width, leftHeight, rightHeight, flip) {
     var vertices = state.vertices, normals = state.normals, indices = state.indices;
     var vertexCount = vertices.elementCount;
     v3fromArray(tA, normalVectors, offset);
@@ -64,11 +64,20 @@ function addCap(offset, state, controlPoints, normalVectors, binormalVectors, wi
         caAdd3(vertices, p4[0], p4[1], p4[2]);
         v3copy(verticalVector, verticalLeftVector);
     }
-    for (var i = 0; i < 4; ++i) {
-        caAdd3(normals, normalVector[0], normalVector[1], normalVector[2]);
+    if (flip) {
+        for (var i = 0; i < 4; ++i) {
+            caAdd3(normals, -normalVector[0], -normalVector[1], -normalVector[2]);
+        }
+        caAdd3(indices, vertexCount, vertexCount + 1, vertexCount + 2);
+        caAdd3(indices, vertexCount + 2, vertexCount + 3, vertexCount);
+    }
+    else {
+        for (var i = 0; i < 4; ++i) {
+            caAdd3(normals, normalVector[0], normalVector[1], normalVector[2]);
+        }
+        caAdd3(indices, vertexCount + 2, vertexCount + 1, vertexCount);
+        caAdd3(indices, vertexCount, vertexCount + 3, vertexCount + 2);
     }
-    caAdd3(indices, vertexCount + 2, vertexCount + 1, vertexCount);
-    caAdd3(indices, vertexCount, vertexCount + 3, vertexCount + 2);
 }
 /** set arrowHeight = 0 for no arrow */
 function addSheet(state, controlPoints, normalVectors, binormalVectors, linearSegments, widthValues, heightValues, arrowHeight, startCap, endCap) {
@@ -155,19 +164,18 @@ function addSheet(state, controlPoints, normalVectors, binormalVectors, linearSe
         var width = widthValues[0];
         var height = heightValues[0];
         var h = arrowHeight === 0 ? height : arrowHeight;
-        addCap(0, state, controlPoints, normalVectors, binormalVectors, width, h, h);
+        addCap(0, state, controlPoints, normalVectors, binormalVectors, width, h, h, false);
     }
     else if (arrowHeight > 0) {
         var width = widthValues[0];
         var height = heightValues[0];
-        addCap(0, state, controlPoints, normalVectors, binormalVectors, width, arrowHeight, -height);
-        addCap(0, state, controlPoints, normalVectors, binormalVectors, width, -arrowHeight, height);
+        addCap(0, state, controlPoints, normalVectors, binormalVectors, width, arrowHeight, -height, false);
+        addCap(0, state, controlPoints, normalVectors, binormalVectors, width, -arrowHeight, height, false);
     }
     if (endCap && arrowHeight === 0) {
         var width = widthValues[linearSegments];
         var height = heightValues[linearSegments];
-        // use negative height to flip the direction the cap's triangles are facing
-        addCap(linearSegments * 3, state, controlPoints, normalVectors, binormalVectors, width, -height, -height);
+        addCap(linearSegments * 3, state, controlPoints, normalVectors, binormalVectors, width, height, height, true);
     }
     var addedVertexCount = (linearSegments + 1) * 8 +
         (startCap ? 4 : (arrowHeight > 0 ? 8 : 0)) +

package/lib/commonjs/mol-geo/geometry/mesh/builder/sheet.js.map CHANGED Viewed

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

package/lib/commonjs/mol-geo/geometry/mesh/builder/tube.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
 /**
- * Copyright (c) 2018-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 import { MeshBuilder } from '../mesh-builder';
-export declare function addTube(state: MeshBuilder.State, controlPoints: ArrayLike<number>, normalVectors: ArrayLike<number>, binormalVectors: ArrayLike<number>, linearSegments: number, radialSegments: number, widthValues: ArrayLike<number>, heightValues: ArrayLike<number>, startCap: boolean, endCap: boolean): void;
+export declare function addTube(state: MeshBuilder.State, controlPoints: ArrayLike<number>, normalVectors: ArrayLike<number>, binormalVectors: ArrayLike<number>, linearSegments: number, radialSegments: number, widthValues: ArrayLike<number>, heightValues: ArrayLike<number>, startCap: boolean, endCap: boolean, crossSection: 'elliptical' | 'rounded'): void;

package/lib/commonjs/mol-geo/geometry/mesh/builder/tube.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2018-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author David Sehnal <david.sehnal@gmail.com>
@@ -27,9 +27,10 @@ function add3AndScale2(out, a, b, c, sa, sb) {
 // avoiding namespace lookup improved performance in Chrome (Aug 2020)
 var v3fromArray = linear_algebra_1.Vec3.fromArray;
 var v3normalize = linear_algebra_1.Vec3.normalize;
-var v3negate = linear_algebra_1.Vec3.negate;
-var v3copy = linear_algebra_1.Vec3.copy;
+var v3scaleAndAdd = linear_algebra_1.Vec3.scaleAndAdd;
 var v3cross = linear_algebra_1.Vec3.cross;
+var v3dot = linear_algebra_1.Vec3.dot;
+var v3unitX = linear_algebra_1.Vec3.unitX;
 var caAdd3 = util_1.ChunkedArray.add3;
 var CosSinCache = new Map();
 function getCosSin(radialSegments) {
@@ -45,10 +46,12 @@ function getCosSin(radialSegments) {
     }
     return CosSinCache.get(radialSegments);
 }
-function addTube(state, controlPoints, normalVectors, binormalVectors, linearSegments, radialSegments, widthValues, heightValues, startCap, endCap) {
+function addTube(state, controlPoints, normalVectors, binormalVectors, linearSegments, radialSegments, widthValues, heightValues, startCap, endCap, crossSection) {
     var currentGroup = state.currentGroup, vertices = state.vertices, normals = state.normals, indices = state.indices, groups = state.groups;
     var vertexCount = vertices.elementCount;
     var _a = getCosSin(radialSegments), cos = _a.cos, sin = _a.sin;
+    var q1 = radialSegments / 4;
+    var q3 = q1 * 3;
     for (var i = 0; i <= linearSegments; ++i) {
         var i3 = i * 3;
         v3fromArray(u, normalVectors, i3);
@@ -56,15 +59,18 @@ function addTube(state, controlPoints, normalVectors, binormalVectors, linearSeg
         v3fromArray(controlPoint, controlPoints, i3);
         var width = widthValues[i];
         var height = heightValues[i];
+        var rounded = crossSection === 'rounded' && height > width;
         for (var j = 0; j < radialSegments; ++j) {
-            add3AndScale2(surfacePoint, u, v, controlPoint, height * cos[j], width * sin[j]);
-            if (radialSegments === 2) {
-                v3copy(normalVector, v);
-                v3normalize(normalVector, normalVector);
-                if (j !== 0 || i % 2 === 0)
-                    v3negate(normalVector, normalVector);
+            if (rounded) {
+                add3AndScale2(surfacePoint, u, v, controlPoint, width * cos[j], width * sin[j]);
+                var h = v3dot(v, v3unitX) < 0
+                    ? (j < q1 || j >= q3) ? height - width : -height + width
+                    : (j >= q1 && j < q3) ? -height + width : height - width;
+                v3scaleAndAdd(surfacePoint, surfacePoint, u, h);
+                add2AndScale2(normalVector, u, v, cos[j], sin[j]);
             }
             else {
+                add3AndScale2(surfacePoint, u, v, controlPoint, height * cos[j], width * sin[j]);
                 add2AndScale2(normalVector, u, v, width * cos[j], height * sin[j]);
             }
             v3normalize(normalVector, normalVector);
@@ -72,10 +78,28 @@ function addTube(state, controlPoints, normalVectors, binormalVectors, linearSeg
             caAdd3(normals, normalVector[0], normalVector[1], normalVector[2]);
         }
     }
+    var radialSegmentsHalf = Math.round(radialSegments / 2);
     for (var i = 0; i < linearSegments; ++i) {
-        for (var j = 0; j < radialSegments; ++j) {
-            caAdd3(indices, vertexCount + i * radialSegments + (j + 1) % radialSegments, vertexCount + (i + 1) * radialSegments + (j + 1) % radialSegments, vertexCount + i * radialSegments + j);
-            caAdd3(indices, vertexCount + (i + 1) * radialSegments + (j + 1) % radialSegments, vertexCount + (i + 1) * radialSegments + j, vertexCount + i * radialSegments + j);
+        // the triangles are arranged such that opposing triangles of the sheet align
+        // which prevents triangle intersection within tight curves
+        for (var j = 0; j < radialSegmentsHalf; ++j) {
+            caAdd3(indices, vertexCount + i * radialSegments + (j + 1) % radialSegments, // a
+            vertexCount + (i + 1) * radialSegments + (j + 1) % radialSegments, // c
+            vertexCount + i * radialSegments + j // b
+            );
+            caAdd3(indices, vertexCount + (i + 1) * radialSegments + (j + 1) % radialSegments, // c
+            vertexCount + (i + 1) * radialSegments + j, // d
+            vertexCount + i * radialSegments + j // b
+            );
+        }
+        for (var j = radialSegmentsHalf; j < radialSegments; ++j) {
+            caAdd3(indices, vertexCount + i * radialSegments + (j + 1) % radialSegments, // a
+            vertexCount + (i + 1) * radialSegments + j, // d
+            vertexCount + i * radialSegments + j // b
+            );
+            caAdd3(indices, vertexCount + (i + 1) * radialSegments + (j + 1) % radialSegments, // c
+            vertexCount + (i + 1) * radialSegments + j, // d
+            vertexCount + i * radialSegments + (j + 1) % radialSegments);
         }
     }
     if (startCap) {
@@ -89,9 +113,18 @@ function addTube(state, controlPoints, normalVectors, binormalVectors, linearSeg
         caAdd3(normals, normalVector[0], normalVector[1], normalVector[2]);
         var width = widthValues[0];
         var height = heightValues[0];
+        var rounded = crossSection === 'rounded' && height > width;
+        if (rounded)
+            height -= width;
         vertexCount = vertices.elementCount;
         for (var i = 0; i < radialSegments; ++i) {
-            add3AndScale2(surfacePoint, u, v, controlPoint, height * cos[i], width * sin[i]);
+            if (rounded) {
+                add3AndScale2(surfacePoint, u, v, controlPoint, width * cos[i], width * sin[i]);
+                v3scaleAndAdd(surfacePoint, surfacePoint, u, (i < q1 || i >= q3) ? height : -height);
+            }
+            else {
+                add3AndScale2(surfacePoint, u, v, controlPoint, height * cos[i], width * sin[i]);
+            }
             caAdd3(vertices, surfacePoint[0], surfacePoint[1], surfacePoint[2]);
             caAdd3(normals, normalVector[0], normalVector[1], normalVector[2]);
             caAdd3(indices, vertexCount + (i + 1) % radialSegments, vertexCount + i, centerVertex);
@@ -108,9 +141,18 @@ function addTube(state, controlPoints, normalVectors, binormalVectors, linearSeg
         caAdd3(normals, normalVector[0], normalVector[1], normalVector[2]);
         var width = widthValues[linearSegments];
         var height = heightValues[linearSegments];
+        var rounded = crossSection === 'rounded' && height > width;
+        if (rounded)
+            height -= width;
         vertexCount = vertices.elementCount;
         for (var i = 0; i < radialSegments; ++i) {
-            add3AndScale2(surfacePoint, u, v, controlPoint, height * cos[i], width * sin[i]);
+            if (rounded) {
+                add3AndScale2(surfacePoint, u, v, controlPoint, width * cos[i], width * sin[i]);
+                v3scaleAndAdd(surfacePoint, surfacePoint, u, (i < q1 || i >= q3) ? height : -height);
+            }
+            else {
+                add3AndScale2(surfacePoint, u, v, controlPoint, height * cos[i], width * sin[i]);
+            }
             caAdd3(vertices, surfacePoint[0], surfacePoint[1], surfacePoint[2]);
             caAdd3(normals, normalVector[0], normalVector[1], normalVector[2]);
             caAdd3(indices, vertexCount + i, vertexCount + (i + 1) % radialSegments, centerVertex);

package/lib/commonjs/mol-geo/geometry/mesh/builder/tube.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tube.js","sourceRoot":"","sources":["../../../../../../src/mol-geo/geometry/mesh/builder/tube.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,sEAA2D;AAC3D,kDAAyD;AAGzD,IAAM,YAAY,GAAG,IAAA,qBAAI,GAAE,CAAC;AAC5B,IAAM,YAAY,GAAG,IAAA,qBAAI,GAAE,CAAC;AAC5B,IAAM,YAAY,GAAG,IAAA,qBAAI,GAAE,CAAC;AAC5B,IAAM,CAAC,GAAG,IAAA,qBAAI,GAAE,CAAC;AACjB,IAAM,CAAC,GAAG,IAAA,qBAAI,GAAE,CAAC;AAEjB,SAAS,aAAa,CAAC,GAAS,EAAE,CAAO,EAAE,CAAO,EAAE,EAAU,EAAE,EAAU;IACtE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IACnC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IACnC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,aAAa,CAAC,GAAS,EAAE,CAAO,EAAE,CAAO,EAAE,CAAO,EAAE,EAAU,EAAE,EAAU;IAC/E,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9C,CAAC;AAED,sEAAsE;AACtE,IAAM,WAAW,GAAG,qBAAI,CAAC,SAAS,CAAC;AACnC,IAAM,WAAW,GAAG,qBAAI,CAAC,SAAS,CAAC;AACnC,IAAM,~~QAAQ~~,GAAG,qBAAI,CAAC,~~MAAM~~,CAAC;~~AAC7B~~,IAAM,~~MAAM~~,GAAG,qBAAI,CAAC,~~IAAI~~,CAAC;~~AACzB~~,IAAM,OAAO,GAAG,qBAAI,CAAC,KAAK,CAAC;AAC3B,IAAM,MAAM,GAAG,mBAAY,CAAC,IAAI,CAAC;AAEjC,IAAM,WAAW,GAAG,IAAI,GAAG,EAA4C,CAAC;AACxE,SAAS,SAAS,CAAC,cAAsB;IACrC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE;QAClC,IAAM,GAAG,GAAa,EAAE,CAAC;QACzB,IAAM,GAAG,GAAa,EAAE,CAAC;QACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,EAAE,CAAC,EAAE;YACrC,IAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,GAAG,cAAc,CAAC;YAC3C,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACrB,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACxB;QACD,WAAW,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,GAAG,KAAA,EAAE,GAAG,KAAA,EAAE,CAAC,CAAC;KACjD;IACD,OAAO,WAAW,CAAC,GAAG,CAAC,cAAc,CAAE,CAAC;AAC5C,CAAC;AAED,SAAgB,OAAO,CAAC,KAAwB,EAAE,aAAgC,EAAE,aAAgC,EAAE,eAAkC,EAAE,cAAsB,EAAE,cAAsB,EAAE,WAA8B,EAAE,YAA+B,EAAE,QAAiB,EAAE,MAAe;~~IACjS~~,IAAA,YAAY,GAAyC,KAAK,aAA9C,EAAE,QAAQ,GAA+B,KAAK,SAApC,EAAE,OAAO,GAAsB,KAAK,QAA3B,EAAE,OAAO,GAAa,KAAK,QAAlB,EAAE,MAAM,GAAK,KAAK,OAAV,CAAW;IAEnE,IAAI,WAAW,GAAG,QAAQ,CAAC,YAAY,CAAC;IAElC,IAAA,KAAe,SAAS,CAAC,cAAc,CAAC,EAAtC,GAAG,SAAA,EAAE,GAAG,SAA8B,CAAC;IAE/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,cAAc,EAAE,EAAE,CAAC,EAAE;QACtC,IAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,WAAW,CAAC,CAAC,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;QAClC,WAAW,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;QACpC,WAAW,CAAC,YAAY,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;QAE7C,IAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAM,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;~~QAE~~/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,EAAE,CAAC,EAAE;YACrC,aAAa,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,EAAE,YAAY,EAAE,~~MAAM~~,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;~~YACjF~~,~~IAAI~~,~~cAAc~~,KAAK,CAAC,EAAE;~~gBACtB~~,~~MAAM~~,CAAC,~~YAAY~~,EAAE,CAAC,CAAC,CAAC~~;gBACxB~~,~~WAAW~~,CAAC,~~YAAY~~,~~EAAE~~,~~YAAY~~,CAAC,CAAC~~;gBACxC~~,~~IAAI~~,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;~~oBAAE~~,~~QAAQ~~,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;~~aACpE~~;iBAAM;gBACH,aAAa,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;aACtE;YACD,WAAW,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;YAExC,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;YACpE,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;SACtE;KACJ;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,EAAE,CAAC,EAAE;QACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,~~cAAc~~,EAAE,EAAE,CAAC,EAAE;~~YACrC~~,MAAM,CACF,OAAO,EACP,WAAW,GAAG,CAAC,GAAG,cAAc,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,cAAc,~~EAC3D~~,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,cAAc,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,cAAc,~~EACjE~~,WAAW,GAAG,CAAC,GAAG,cAAc,GAAG,CAAC,~~CACvC~~,CAAC;YACF,MAAM,CACF,OAAO,EACP,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,cAAc,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,cAAc,~~EACjE~~,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,cAAc,GAAG,CAAC,~~EAC1C~~,WAAW,GAAG,CAAC,GAAG,cAAc,GAAG,CAAC,~~CACvC~~,CAAC;SACL;KACJ;IAED,IAAI,QAAQ,EAAE;QACV,IAAM,MAAM,GAAG,CAAC,CAAC;QACjB,IAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;QAC3C,WAAW,CAAC,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QACtC,WAAW,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,CAAC;QACxC,WAAW,CAAC,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QACjD,OAAO,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAE5B,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QAEnE,IAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC7B,~~IAAM~~,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;~~QAE/B~~,WAAW,GAAG,QAAQ,CAAC,YAAY,CAAC;QACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,EAAE,CAAC,EAAE;YACrC,aAAa,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,EAAE,YAAY,EAAE,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;~~YAEjF~~,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;YACpE,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;YAEnE,MAAM,CACF,OAAO,EACP,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,cAAc,EACtC,WAAW,GAAG,CAAC,EACf,YAAY,CACf,CAAC;SACL;KACJ;IAED,IAAI,MAAM,EAAE;QACR,IAAM,MAAM,GAAG,cAAc,GAAG,CAAC,CAAC;QAClC,IAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;QAC3C,WAAW,CAAC,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QACtC,WAAW,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,CAAC;QACxC,WAAW,CAAC,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QACjD,OAAO,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAE5B,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QAEnE,IAAM,KAAK,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC;QAC1C,~~IAAM~~,MAAM,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC;~~QAE5C~~,WAAW,GAAG,QAAQ,CAAC,YAAY,CAAC;QACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,EAAE,CAAC,EAAE;YACrC,aAAa,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,EAAE,YAAY,EAAE,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;~~YAEjF~~,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;YACpE,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;YAEnE,MAAM,CACF,OAAO,EACP,WAAW,GAAG,CAAC,EACf,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,cAAc,EACtC,YAAY,CACf,CAAC;SACL;KACJ;IAED,IAAM,gBAAgB,GAAG,CAAC,cAAc,GAAG,CAAC,CAAC,GAAG,cAAc,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzI,mBAAY,CAAC,SAAS,CAAC,MAAM,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;AACnE,CAAC;~~AA/GD~~,~~0BA+GC~~"}
1	+ {"version":3,"file":"tube.js","sourceRoot":"","sources":["../../../../../../src/mol-geo/geometry/mesh/builder/tube.ts"],"names":[],"mappings":"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"}

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

@@ -63,7 +63,7 @@ export declare namespace Mesh {
         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">;
     };
     type Params = typeof Params;
     const Utils: GeometryUtils<Mesh, Params>;

package/lib/commonjs/mol-geo/geometry/mesh/mesh.js CHANGED Viewed

@@ -111,7 +111,7 @@ var Mesh;
         if (fractionDigits === void 0) { fractionDigits = 3; }
         var v = mesh.vertexBuffer.ref.value;
         var map = new Map();
-        var hash = function (v, d) { return v[0].toFixed(d) + "|" + v[1].toFixed(d) + "|" + v[2].toFixed(d); };
+        var hash = function (v, d) { return "".concat(v[0].toFixed(d), "|").concat(v[1].toFixed(d), "|").concat(v[2].toFixed(d)); };
         var duplicates = 0;
         var a = (0, linear_algebra_1.Vec3)();
         for (var i = 0, il = mesh.vertexCount; i < il; ++i) {