npm - molstar - Versions diffs - 3.0.0-dev.2 → 3.0.0-dev.6 - Mend

molstar 3.0.0-dev.2 → 3.0.0-dev.6

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 (493) hide show

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

@@ -63,6 +63,7 @@ export declare namespace Text {
         material: PD.Group<PD.Normalize<{
             metalness: number;
             roughness: number;
+            bumpiness: number;
         }>>;
     };
     type Params = typeof Params;

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

@@ -404,10 +404,10 @@ function applyTextureMeshSubstanceSmoothing(values, resolution, stride, webgl, c
     if (!isSupportedSubstanceType(values.dSubstanceType.ref.value))
         return;
     stride *= 3; // triple because TextureMesh is never indexed (no elements buffer)
-    if (!webgl.namedTextures[ColorSmoothingRgbName]) {
-        webgl.namedTextures[ColorSmoothingRgbName] = webgl.resources.texture('image-uint8', 'rgb', 'ubyte', 'nearest');
+    if (!webgl.namedTextures[ColorSmoothingRgbaName]) {
+        webgl.namedTextures[ColorSmoothingRgbaName] = webgl.resources.texture('image-uint8', 'rgba', 'ubyte', 'nearest');
     }
-    var colorData = webgl.namedTextures[ColorSmoothingRgbName];
+    var colorData = webgl.namedTextures[ColorSmoothingRgbaName];
     colorData.load(values.tSubstance.ref.value);
     var smoothingData = calcTextureMeshColorSmoothing({
         vertexCount: values.uVertexCount.ref.value,

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

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

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

@@ -89,7 +89,7 @@ var TextureMesh;
         return create(0, 0, vt, gt, nt, bs, textureMesh);
     }
     TextureMesh.createEmpty = createEmpty;
-    TextureMesh.Params = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, base_1.BaseGeometry.Params), { doubleSided: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.CustomQualityParamInfo), flipSided: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory), flatShaded: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory), ignoreLight: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory), xrayShaded: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory) });
+    TextureMesh.Params = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, base_1.BaseGeometry.Params), { doubleSided: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.CustomQualityParamInfo), flipSided: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory), flatShaded: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory), ignoreLight: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory), xrayShaded: param_definition_1.ParamDefinition.Boolean(false, base_1.BaseGeometry.ShadingCategory), bumpFrequency: param_definition_1.ParamDefinition.Numeric(0, { min: 0, max: 10, step: 0.1 }, base_1.BaseGeometry.ShadingCategory), bumpAmplitude: param_definition_1.ParamDefinition.Numeric(1, { min: 0, max: 5, step: 0.1 }, base_1.BaseGeometry.ShadingCategory) });
     TextureMesh.Utils = {
         Params: TextureMesh.Params,
         createEmpty: createEmpty,
@@ -113,7 +113,7 @@ var TextureMesh;
         var counts = { drawCount: textureMesh.vertexCount, vertexCount: textureMesh.vertexCount, groupCount: groupCount, instanceCount: instanceCount };
         var invariantBoundingSphere = geometry_1.Sphere3D.clone(textureMesh.boundingSphere);
         var boundingSphere = (0, util_1.calculateTransformBoundingSphere)(invariantBoundingSphere, transform.aTransform.ref.value, instanceCount);
-        return (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({ uGeoTexDim: textureMesh.geoTextureDim, tPosition: textureMesh.vertexTexture, tGroup: textureMesh.groupTexture, tNormal: textureMesh.normalTexture, boundingSphere: mol_util_1.ValueCell.create(boundingSphere), invariantBoundingSphere: mol_util_1.ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: mol_util_1.ValueCell.create(linear_algebra_1.Vec4.ofSphere(invariantBoundingSphere)) }, color), marker), overpaint), transparency), substance), clipping), transform), base_1.BaseGeometry.createValues(props, counts)), { dDoubleSided: mol_util_1.ValueCell.create(props.doubleSided), dFlatShaded: mol_util_1.ValueCell.create(props.flatShaded), dFlipSided: mol_util_1.ValueCell.create(props.flipSided), dIgnoreLight: mol_util_1.ValueCell.create(props.ignoreLight), dXrayShaded: mol_util_1.ValueCell.create(props.xrayShaded), dGeoTexture: mol_util_1.ValueCell.create(true), meta: mol_util_1.ValueCell.create(textureMesh.meta) });
+        return (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({ uGeoTexDim: textureMesh.geoTextureDim, tPosition: textureMesh.vertexTexture, tGroup: textureMesh.groupTexture, tNormal: textureMesh.normalTexture, boundingSphere: mol_util_1.ValueCell.create(boundingSphere), invariantBoundingSphere: mol_util_1.ValueCell.create(invariantBoundingSphere), uInvariantBoundingSphere: mol_util_1.ValueCell.create(linear_algebra_1.Vec4.ofSphere(invariantBoundingSphere)) }, color), marker), overpaint), transparency), substance), clipping), transform), base_1.BaseGeometry.createValues(props, counts)), { dDoubleSided: mol_util_1.ValueCell.create(props.doubleSided), dFlatShaded: mol_util_1.ValueCell.create(props.flatShaded), dFlipSided: mol_util_1.ValueCell.create(props.flipSided), dIgnoreLight: mol_util_1.ValueCell.create(props.ignoreLight), dXrayShaded: mol_util_1.ValueCell.create(props.xrayShaded), uBumpFrequency: mol_util_1.ValueCell.create(props.bumpFrequency), uBumpAmplitude: mol_util_1.ValueCell.create(props.bumpAmplitude), dGeoTexture: mol_util_1.ValueCell.create(true), meta: mol_util_1.ValueCell.create(textureMesh.meta) });
     }
     function createValuesSimple(textureMesh, props, colorValue, sizeValue, transform) {
         var s = base_1.BaseGeometry.createSimple(colorValue, sizeValue, transform);
@@ -127,6 +127,8 @@ var TextureMesh;
         mol_util_1.ValueCell.updateIfChanged(values.dFlipSided, props.flipSided);
         mol_util_1.ValueCell.updateIfChanged(values.dIgnoreLight, props.ignoreLight);
         mol_util_1.ValueCell.updateIfChanged(values.dXrayShaded, props.xrayShaded);
+        mol_util_1.ValueCell.updateIfChanged(values.uBumpFrequency, props.bumpFrequency);
+        mol_util_1.ValueCell.updateIfChanged(values.uBumpAmplitude, props.bumpAmplitude);
     }
     function updateBoundingSphere(values, textureMesh) {
         var invariantBoundingSphere = geometry_1.Sphere3D.clone(textureMesh.boundingSphere);

package/lib/commonjs/mol-gl/renderable/cylinders.d.ts CHANGED Viewed

@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 import { Renderable, RenderableState } from '../renderable';
 import { WebGLContext } from '../webgl/context';
-import { AttributeSpec, Values, ElementsSpec, ValueSpec, DefineSpec } from './schema';
+import { AttributeSpec, Values, ElementsSpec, ValueSpec, DefineSpec, UniformSpec } from './schema';
 export declare const CylindersSchema: {
     aGroup: AttributeSpec<"float32">;
     aStart: AttributeSpec<"float32">;
@@ -18,21 +18,24 @@ export declare const CylindersSchema: {
     dDoubleSided: DefineSpec<"boolean">;
     dIgnoreLight: DefineSpec<"boolean">;
     dXrayShaded: DefineSpec<"boolean">;
-    uSize: import("./schema").UniformSpec<"f">;
-    uSizeTexDim: import("./schema").UniformSpec<"v2">;
+    uBumpFrequency: UniformSpec<"f">;
+    uBumpAmplitude: UniformSpec<"f">;
+    uSize: UniformSpec<"f">;
+    uSizeTexDim: UniformSpec<"v2">;
     tSize: import("./schema").TextureSpec<"image-uint8">;
     dSizeType: DefineSpec<"string">;
-    uSizeFactor: import("./schema").UniformSpec<"f">;
+    uSizeFactor: 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">;
-    uInvariantBoundingSphere: import("./schema").UniformSpec<"v4">;
+    uAlpha: UniformSpec<"f">;
+    uMetalness: UniformSpec<"f">;
+    uRoughness: UniformSpec<"f">;
+    uBumpiness: UniformSpec<"f">;
+    uVertexCount: UniformSpec<"i">;
+    uInstanceCount: UniformSpec<"i">;
+    uGroupCount: UniformSpec<"i">;
+    uInvariantBoundingSphere: UniformSpec<"v4">;
     drawCount: ValueSpec<"number">;
     instanceCount: ValueSpec<"number">;
     alpha: ValueSpec<"number">;
@@ -44,41 +47,41 @@ export declare const CylindersSchema: {
     invariantBoundingSphere: ValueSpec<"sphere">;
     dClipObjectCount: DefineSpec<"number">;
     dClipVariant: DefineSpec<"string">;
-    uClippingTexDim: import("./schema").UniformSpec<"v2">;
+    uClippingTexDim: UniformSpec<"v2">;
     tClipping: import("./schema").TextureSpec<"image-uint8">;
     dClipping: DefineSpec<"boolean">;
-    uSubstanceTexDim: import("./schema").UniformSpec<"v2">;
+    uSubstanceTexDim: UniformSpec<"v2">;
     tSubstance: import("./schema").TextureSpec<"image-uint8">;
     dSubstance: DefineSpec<"boolean">;
-    uSubstanceGridDim: import("./schema").UniformSpec<"v3">;
-    uSubstanceGridTransform: import("./schema").UniformSpec<"v4">;
+    uSubstanceGridDim: UniformSpec<"v3">;
+    uSubstanceGridTransform: UniformSpec<"v4">;
     tSubstanceGrid: import("./schema").TextureSpec<"texture">;
     dSubstanceType: DefineSpec<"string">;
-    uTransparencyTexDim: import("./schema").UniformSpec<"v2">;
+    uTransparencyTexDim: UniformSpec<"v2">;
     tTransparency: import("./schema").TextureSpec<"image-uint8">;
     dTransparency: DefineSpec<"boolean">;
     transparencyAverage: ValueSpec<"number">;
-    uTransparencyGridDim: import("./schema").UniformSpec<"v3">;
-    uTransparencyGridTransform: import("./schema").UniformSpec<"v4">;
+    uTransparencyGridDim: UniformSpec<"v3">;
+    uTransparencyGridTransform: UniformSpec<"v4">;
     tTransparencyGrid: import("./schema").TextureSpec<"texture">;
     dTransparencyType: DefineSpec<"string">;
-    uOverpaintTexDim: import("./schema").UniformSpec<"v2">;
+    uOverpaintTexDim: UniformSpec<"v2">;
     tOverpaint: import("./schema").TextureSpec<"image-uint8">;
     dOverpaint: DefineSpec<"boolean">;
-    uOverpaintGridDim: import("./schema").UniformSpec<"v3">;
-    uOverpaintGridTransform: import("./schema").UniformSpec<"v4">;
+    uOverpaintGridDim: UniformSpec<"v3">;
+    uOverpaintGridTransform: UniformSpec<"v4">;
     tOverpaintGrid: import("./schema").TextureSpec<"texture">;
     dOverpaintType: DefineSpec<"string">;
-    uMarker: import("./schema").UniformSpec<"f">;
-    uMarkerTexDim: import("./schema").UniformSpec<"v2">;
+    uMarker: UniformSpec<"f">;
+    uMarkerTexDim: UniformSpec<"v2">;
     tMarker: import("./schema").TextureSpec<"image-uint8">;
     dMarkerType: DefineSpec<"string">;
     markerAverage: ValueSpec<"number">;
     markerStatus: ValueSpec<"number">;
-    uColor: import("./schema").UniformSpec<"v3">;
-    uColorTexDim: import("./schema").UniformSpec<"v2">;
-    uColorGridDim: import("./schema").UniformSpec<"v3">;
-    uColorGridTransform: import("./schema").UniformSpec<"v4">;
+    uColor: UniformSpec<"v3">;
+    uColorTexDim: UniformSpec<"v2">;
+    uColorGridDim: UniformSpec<"v3">;
+    uColorGridTransform: UniformSpec<"v4">;
     tColor: import("./schema").TextureSpec<"image-uint8">;
     tPalette: import("./schema").TextureSpec<"image-uint8">;
     tColorGrid: import("./schema").TextureSpec<"texture">;

package/lib/commonjs/mol-gl/renderable/cylinders.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -12,7 +12,7 @@ var render_item_1 = require("../webgl/render-item");
 var schema_1 = require("./schema");
 var shader_code_1 = require("../shader-code");
 var mol_util_1 = require("../../mol-util");
-exports.CylindersSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.BaseSchema), schema_1.SizeSchema), { aGroup: (0, schema_1.AttributeSpec)('float32', 1, 0), aStart: (0, schema_1.AttributeSpec)('float32', 3, 0), aEnd: (0, schema_1.AttributeSpec)('float32', 3, 0), aMapping: (0, schema_1.AttributeSpec)('float32', 3, 0), aScale: (0, schema_1.AttributeSpec)('float32', 1, 0), aCap: (0, schema_1.AttributeSpec)('float32', 1, 0), elements: (0, schema_1.ElementsSpec)('uint32'), padding: (0, schema_1.ValueSpec)('number'), dDoubleSided: (0, schema_1.DefineSpec)('boolean'), dIgnoreLight: (0, schema_1.DefineSpec)('boolean'), dXrayShaded: (0, schema_1.DefineSpec)('boolean') });
+exports.CylindersSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.BaseSchema), schema_1.SizeSchema), { aGroup: (0, schema_1.AttributeSpec)('float32', 1, 0), aStart: (0, schema_1.AttributeSpec)('float32', 3, 0), aEnd: (0, schema_1.AttributeSpec)('float32', 3, 0), aMapping: (0, schema_1.AttributeSpec)('float32', 3, 0), aScale: (0, schema_1.AttributeSpec)('float32', 1, 0), aCap: (0, schema_1.AttributeSpec)('float32', 1, 0), elements: (0, schema_1.ElementsSpec)('uint32'), padding: (0, schema_1.ValueSpec)('number'), dDoubleSided: (0, schema_1.DefineSpec)('boolean'), dIgnoreLight: (0, schema_1.DefineSpec)('boolean'), dXrayShaded: (0, schema_1.DefineSpec)('boolean'), uBumpFrequency: (0, schema_1.UniformSpec)('f'), uBumpAmplitude: (0, schema_1.UniformSpec)('f') });
 function CylindersRenderable(ctx, id, values, state, materialId) {
     var schema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.GlobalUniformSchema), schema_1.GlobalTextureSchema), schema_1.InternalSchema), exports.CylindersSchema);
     var internalValues = {

package/lib/commonjs/mol-gl/renderable/direct-volume.d.ts CHANGED Viewed

@@ -45,6 +45,7 @@ export declare const DirectVolumeSchema: {
     uAlpha: UniformSpec<"f">;
     uMetalness: UniformSpec<"f">;
     uRoughness: UniformSpec<"f">;
+    uBumpiness: UniformSpec<"f">;
     uVertexCount: UniformSpec<"i">;
     uInstanceCount: UniformSpec<"i">;
     uGroupCount: UniformSpec<"i">;

package/lib/commonjs/mol-gl/renderable/image.d.ts CHANGED Viewed

@@ -21,6 +21,7 @@ export declare const ImageSchema: {
     uAlpha: UniformSpec<"f">;
     uMetalness: UniformSpec<"f">;
     uRoughness: UniformSpec<"f">;
+    uBumpiness: UniformSpec<"f">;
     uVertexCount: UniformSpec<"i">;
     uInstanceCount: UniformSpec<"i">;
     uGroupCount: UniformSpec<"i">;

package/lib/commonjs/mol-gl/renderable/lines.d.ts CHANGED Viewed

@@ -26,6 +26,7 @@ export declare const LinesSchema: {
     uAlpha: import("./schema").UniformSpec<"f">;
     uMetalness: import("./schema").UniformSpec<"f">;
     uRoughness: import("./schema").UniformSpec<"f">;
+    uBumpiness: import("./schema").UniformSpec<"f">;
     uVertexCount: import("./schema").UniformSpec<"i">;
     uInstanceCount: import("./schema").UniformSpec<"i">;
     uGroupCount: import("./schema").UniformSpec<"i">;

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

@@ -1,11 +1,11 @@
 /**
- * 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>
  */
 import { Renderable, RenderableState } from '../renderable';
 import { WebGLContext } from '../webgl/context';
-import { AttributeSpec, ElementsSpec, DefineSpec, Values, ValueSpec } from './schema';
+import { AttributeSpec, ElementsSpec, DefineSpec, Values, ValueSpec, UniformSpec } from './schema';
 export declare const MeshSchema: {
     readonly aGroup: AttributeSpec<"float32">;
     readonly aPosition: AttributeSpec<"float32">;
@@ -16,17 +16,20 @@ export declare const MeshSchema: {
     readonly dFlipSided: DefineSpec<"boolean">;
     readonly dIgnoreLight: DefineSpec<"boolean">;
     readonly dXrayShaded: DefineSpec<"boolean">;
+    readonly uBumpFrequency: UniformSpec<"f">;
+    readonly uBumpAmplitude: UniformSpec<"f">;
     readonly meta: ValueSpec<"unknown">;
     readonly dLightCount: DefineSpec<"number">;
     readonly aInstance: AttributeSpec<"float32">;
     readonly aTransform: AttributeSpec<"float32">;
-    readonly uAlpha: import("./schema").UniformSpec<"f">;
-    readonly uMetalness: import("./schema").UniformSpec<"f">;
-    readonly uRoughness: import("./schema").UniformSpec<"f">;
-    readonly uVertexCount: import("./schema").UniformSpec<"i">;
-    readonly uInstanceCount: import("./schema").UniformSpec<"i">;
-    readonly uGroupCount: import("./schema").UniformSpec<"i">;
-    readonly uInvariantBoundingSphere: import("./schema").UniformSpec<"v4">;
+    readonly uAlpha: UniformSpec<"f">;
+    readonly uMetalness: UniformSpec<"f">;
+    readonly uRoughness: UniformSpec<"f">;
+    readonly uBumpiness: UniformSpec<"f">;
+    readonly uVertexCount: UniformSpec<"i">;
+    readonly uInstanceCount: UniformSpec<"i">;
+    readonly uGroupCount: UniformSpec<"i">;
+    readonly uInvariantBoundingSphere: UniformSpec<"v4">;
     readonly drawCount: ValueSpec<"number">;
     readonly instanceCount: ValueSpec<"number">;
     readonly alpha: ValueSpec<"number">;
@@ -38,41 +41,41 @@ export declare const MeshSchema: {
     readonly invariantBoundingSphere: ValueSpec<"sphere">;
     readonly dClipObjectCount: DefineSpec<"number">;
     readonly dClipVariant: DefineSpec<"string">;
-    readonly uClippingTexDim: import("./schema").UniformSpec<"v2">;
+    readonly uClippingTexDim: UniformSpec<"v2">;
     readonly tClipping: import("./schema").TextureSpec<"image-uint8">;
     readonly dClipping: DefineSpec<"boolean">;
-    readonly uSubstanceTexDim: import("./schema").UniformSpec<"v2">;
+    readonly uSubstanceTexDim: UniformSpec<"v2">;
     readonly tSubstance: import("./schema").TextureSpec<"image-uint8">;
     readonly dSubstance: DefineSpec<"boolean">;
-    readonly uSubstanceGridDim: import("./schema").UniformSpec<"v3">;
-    readonly uSubstanceGridTransform: import("./schema").UniformSpec<"v4">;
+    readonly uSubstanceGridDim: UniformSpec<"v3">;
+    readonly uSubstanceGridTransform: UniformSpec<"v4">;
     readonly tSubstanceGrid: import("./schema").TextureSpec<"texture">;
     readonly dSubstanceType: DefineSpec<"string">;
-    readonly uTransparencyTexDim: import("./schema").UniformSpec<"v2">;
+    readonly uTransparencyTexDim: UniformSpec<"v2">;
     readonly tTransparency: import("./schema").TextureSpec<"image-uint8">;
     readonly dTransparency: DefineSpec<"boolean">;
     readonly transparencyAverage: ValueSpec<"number">;
-    readonly uTransparencyGridDim: import("./schema").UniformSpec<"v3">;
-    readonly uTransparencyGridTransform: import("./schema").UniformSpec<"v4">;
+    readonly uTransparencyGridDim: UniformSpec<"v3">;
+    readonly uTransparencyGridTransform: UniformSpec<"v4">;
     readonly tTransparencyGrid: import("./schema").TextureSpec<"texture">;
     readonly dTransparencyType: DefineSpec<"string">;
-    readonly uOverpaintTexDim: import("./schema").UniformSpec<"v2">;
+    readonly uOverpaintTexDim: UniformSpec<"v2">;
     readonly tOverpaint: import("./schema").TextureSpec<"image-uint8">;
     readonly dOverpaint: DefineSpec<"boolean">;
-    readonly uOverpaintGridDim: import("./schema").UniformSpec<"v3">;
-    readonly uOverpaintGridTransform: import("./schema").UniformSpec<"v4">;
+    readonly uOverpaintGridDim: UniformSpec<"v3">;
+    readonly uOverpaintGridTransform: UniformSpec<"v4">;
     readonly tOverpaintGrid: import("./schema").TextureSpec<"texture">;
     readonly dOverpaintType: DefineSpec<"string">;
-    readonly uMarker: import("./schema").UniformSpec<"f">;
-    readonly uMarkerTexDim: import("./schema").UniformSpec<"v2">;
+    readonly uMarker: UniformSpec<"f">;
+    readonly uMarkerTexDim: UniformSpec<"v2">;
     readonly tMarker: import("./schema").TextureSpec<"image-uint8">;
     readonly dMarkerType: DefineSpec<"string">;
     readonly markerAverage: ValueSpec<"number">;
     readonly markerStatus: ValueSpec<"number">;
-    readonly uColor: import("./schema").UniformSpec<"v3">;
-    readonly uColorTexDim: import("./schema").UniformSpec<"v2">;
-    readonly uColorGridDim: import("./schema").UniformSpec<"v3">;
-    readonly uColorGridTransform: import("./schema").UniformSpec<"v4">;
+    readonly uColor: UniformSpec<"v3">;
+    readonly uColorTexDim: UniformSpec<"v2">;
+    readonly uColorGridDim: UniformSpec<"v3">;
+    readonly uColorGridTransform: UniformSpec<"v4">;
     readonly tColor: import("./schema").TextureSpec<"image-uint8">;
     readonly tPalette: import("./schema").TextureSpec<"image-uint8">;
     readonly tColorGrid: import("./schema").TextureSpec<"texture">;

package/lib/commonjs/mol-gl/renderable/mesh.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>
  */
@@ -12,7 +12,7 @@ var render_item_1 = require("../webgl/render-item");
 var schema_1 = require("./schema");
 var shader_code_1 = require("../shader-code");
 var mol_util_1 = require("../../mol-util");
-exports.MeshSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.BaseSchema), { aGroup: (0, schema_1.AttributeSpec)('float32', 1, 0), aPosition: (0, schema_1.AttributeSpec)('float32', 3, 0), aNormal: (0, schema_1.AttributeSpec)('float32', 3, 0), elements: (0, schema_1.ElementsSpec)('uint32'), dFlatShaded: (0, schema_1.DefineSpec)('boolean'), dDoubleSided: (0, schema_1.DefineSpec)('boolean'), dFlipSided: (0, schema_1.DefineSpec)('boolean'), dIgnoreLight: (0, schema_1.DefineSpec)('boolean'), dXrayShaded: (0, schema_1.DefineSpec)('boolean'), meta: (0, schema_1.ValueSpec)('unknown') });
+exports.MeshSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.BaseSchema), { aGroup: (0, schema_1.AttributeSpec)('float32', 1, 0), aPosition: (0, schema_1.AttributeSpec)('float32', 3, 0), aNormal: (0, schema_1.AttributeSpec)('float32', 3, 0), elements: (0, schema_1.ElementsSpec)('uint32'), dFlatShaded: (0, schema_1.DefineSpec)('boolean'), dDoubleSided: (0, schema_1.DefineSpec)('boolean'), dFlipSided: (0, schema_1.DefineSpec)('boolean'), dIgnoreLight: (0, schema_1.DefineSpec)('boolean'), dXrayShaded: (0, schema_1.DefineSpec)('boolean'), uBumpFrequency: (0, schema_1.UniformSpec)('f'), uBumpAmplitude: (0, schema_1.UniformSpec)('f'), meta: (0, schema_1.ValueSpec)('unknown') });
 function MeshRenderable(ctx, id, values, state, materialId) {
     var schema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.GlobalUniformSchema), schema_1.GlobalTextureSchema), schema_1.InternalSchema), exports.MeshSchema);
     var internalValues = {

package/lib/commonjs/mol-gl/renderable/points.d.ts CHANGED Viewed

@@ -22,6 +22,7 @@ export declare const PointsSchema: {
     uAlpha: import("./schema").UniformSpec<"f">;
     uMetalness: import("./schema").UniformSpec<"f">;
     uRoughness: import("./schema").UniformSpec<"f">;
+    uBumpiness: import("./schema").UniformSpec<"f">;
     uVertexCount: import("./schema").UniformSpec<"i">;
     uInstanceCount: import("./schema").UniformSpec<"i">;
     uGroupCount: import("./schema").UniformSpec<"i">;

package/lib/commonjs/mol-gl/renderable/schema.d.ts CHANGED Viewed

@@ -228,6 +228,7 @@ export declare const BaseSchema: {
     readonly uAlpha: UniformSpec<"f">;
     readonly uMetalness: UniformSpec<"f">;
     readonly uRoughness: UniformSpec<"f">;
+    readonly uBumpiness: UniformSpec<"f">;
     readonly uVertexCount: UniformSpec<"i">;
     readonly uInstanceCount: UniformSpec<"i">;
     readonly uGroupCount: UniformSpec<"i">;

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

@@ -168,11 +168,11 @@ exports.TransparencySchema = {
 };
 exports.SubstanceSchema = {
     uSubstanceTexDim: UniformSpec('v2'),
-    tSubstance: TextureSpec('image-uint8', 'rgb', 'ubyte', 'nearest'),
+    tSubstance: TextureSpec('image-uint8', 'rgba', 'ubyte', 'nearest'),
     dSubstance: DefineSpec('boolean'),
     uSubstanceGridDim: UniformSpec('v3'),
     uSubstanceGridTransform: UniformSpec('v4'),
-    tSubstanceGrid: TextureSpec('texture', 'rgb', 'ubyte', 'linear'),
+    tSubstanceGrid: TextureSpec('texture', 'rgba', 'ubyte', 'linear'),
     dSubstanceType: DefineSpec('string', ['groupInstance', 'volumeInstance']),
 };
 exports.ClippingSchema = {
@@ -191,7 +191,7 @@ exports.BaseSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__a
     /**
      * final alpha, calculated as `values.alpha * state.alpha`
      */
-    uAlpha: UniformSpec('f', 'material'), 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'),
+    uAlpha: UniformSpec('f', 'material'), uMetalness: UniformSpec('f', 'material'), uRoughness: UniformSpec('f', 'material'), uBumpiness: UniformSpec('f', 'material'), uVertexCount: UniformSpec('i'), uInstanceCount: UniformSpec('i'), uGroupCount: UniformSpec('i'), uInvariantBoundingSphere: UniformSpec('v4'), drawCount: ValueSpec('number'), instanceCount: ValueSpec('number'),
     /** base alpha, see uAlpha  */
     alpha: ValueSpec('number'),
     /** global transform, see aTransform */

package/lib/commonjs/mol-gl/renderable/spheres.d.ts CHANGED Viewed

@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2019-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 import { Renderable, RenderableState } from '../renderable';
 import { WebGLContext } from '../webgl/context';
-import { AttributeSpec, Values, ElementsSpec, ValueSpec, DefineSpec } from './schema';
+import { AttributeSpec, Values, ElementsSpec, ValueSpec, DefineSpec, UniformSpec } from './schema';
 export declare const SpheresSchema: {
     aGroup: AttributeSpec<"float32">;
     aPosition: AttributeSpec<"float32">;
@@ -15,21 +15,24 @@ export declare const SpheresSchema: {
     dDoubleSided: DefineSpec<"boolean">;
     dIgnoreLight: DefineSpec<"boolean">;
     dXrayShaded: DefineSpec<"boolean">;
-    uSize: import("./schema").UniformSpec<"f">;
-    uSizeTexDim: import("./schema").UniformSpec<"v2">;
+    uBumpFrequency: UniformSpec<"f">;
+    uBumpAmplitude: UniformSpec<"f">;
+    uSize: UniformSpec<"f">;
+    uSizeTexDim: UniformSpec<"v2">;
     tSize: import("./schema").TextureSpec<"image-uint8">;
     dSizeType: DefineSpec<"string">;
-    uSizeFactor: import("./schema").UniformSpec<"f">;
+    uSizeFactor: 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">;
-    uInvariantBoundingSphere: import("./schema").UniformSpec<"v4">;
+    uAlpha: UniformSpec<"f">;
+    uMetalness: UniformSpec<"f">;
+    uRoughness: UniformSpec<"f">;
+    uBumpiness: UniformSpec<"f">;
+    uVertexCount: UniformSpec<"i">;
+    uInstanceCount: UniformSpec<"i">;
+    uGroupCount: UniformSpec<"i">;
+    uInvariantBoundingSphere: UniformSpec<"v4">;
     drawCount: ValueSpec<"number">;
     instanceCount: ValueSpec<"number">;
     alpha: ValueSpec<"number">;
@@ -41,41 +44,41 @@ export declare const SpheresSchema: {
     invariantBoundingSphere: ValueSpec<"sphere">;
     dClipObjectCount: DefineSpec<"number">;
     dClipVariant: DefineSpec<"string">;
-    uClippingTexDim: import("./schema").UniformSpec<"v2">;
+    uClippingTexDim: UniformSpec<"v2">;
     tClipping: import("./schema").TextureSpec<"image-uint8">;
     dClipping: DefineSpec<"boolean">;
-    uSubstanceTexDim: import("./schema").UniformSpec<"v2">;
+    uSubstanceTexDim: UniformSpec<"v2">;
     tSubstance: import("./schema").TextureSpec<"image-uint8">;
     dSubstance: DefineSpec<"boolean">;
-    uSubstanceGridDim: import("./schema").UniformSpec<"v3">;
-    uSubstanceGridTransform: import("./schema").UniformSpec<"v4">;
+    uSubstanceGridDim: UniformSpec<"v3">;
+    uSubstanceGridTransform: UniformSpec<"v4">;
     tSubstanceGrid: import("./schema").TextureSpec<"texture">;
     dSubstanceType: DefineSpec<"string">;
-    uTransparencyTexDim: import("./schema").UniformSpec<"v2">;
+    uTransparencyTexDim: UniformSpec<"v2">;
     tTransparency: import("./schema").TextureSpec<"image-uint8">;
     dTransparency: DefineSpec<"boolean">;
     transparencyAverage: ValueSpec<"number">;
-    uTransparencyGridDim: import("./schema").UniformSpec<"v3">;
-    uTransparencyGridTransform: import("./schema").UniformSpec<"v4">;
+    uTransparencyGridDim: UniformSpec<"v3">;
+    uTransparencyGridTransform: UniformSpec<"v4">;
     tTransparencyGrid: import("./schema").TextureSpec<"texture">;
     dTransparencyType: DefineSpec<"string">;
-    uOverpaintTexDim: import("./schema").UniformSpec<"v2">;
+    uOverpaintTexDim: UniformSpec<"v2">;
     tOverpaint: import("./schema").TextureSpec<"image-uint8">;
     dOverpaint: DefineSpec<"boolean">;
-    uOverpaintGridDim: import("./schema").UniformSpec<"v3">;
-    uOverpaintGridTransform: import("./schema").UniformSpec<"v4">;
+    uOverpaintGridDim: UniformSpec<"v3">;
+    uOverpaintGridTransform: UniformSpec<"v4">;
     tOverpaintGrid: import("./schema").TextureSpec<"texture">;
     dOverpaintType: DefineSpec<"string">;
-    uMarker: import("./schema").UniformSpec<"f">;
-    uMarkerTexDim: import("./schema").UniformSpec<"v2">;
+    uMarker: UniformSpec<"f">;
+    uMarkerTexDim: UniformSpec<"v2">;
     tMarker: import("./schema").TextureSpec<"image-uint8">;
     dMarkerType: DefineSpec<"string">;
     markerAverage: ValueSpec<"number">;
     markerStatus: ValueSpec<"number">;
-    uColor: import("./schema").UniformSpec<"v3">;
-    uColorTexDim: import("./schema").UniformSpec<"v2">;
-    uColorGridDim: import("./schema").UniformSpec<"v3">;
-    uColorGridTransform: import("./schema").UniformSpec<"v4">;
+    uColor: UniformSpec<"v3">;
+    uColorTexDim: UniformSpec<"v2">;
+    uColorGridDim: UniformSpec<"v3">;
+    uColorGridTransform: UniformSpec<"v4">;
     tColor: import("./schema").TextureSpec<"image-uint8">;
     tPalette: import("./schema").TextureSpec<"image-uint8">;
     tColorGrid: import("./schema").TextureSpec<"texture">;

package/lib/commonjs/mol-gl/renderable/spheres.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2019-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -12,7 +12,7 @@ var render_item_1 = require("../webgl/render-item");
 var schema_1 = require("./schema");
 var shader_code_1 = require("../shader-code");
 var mol_util_1 = require("../../mol-util");
-exports.SpheresSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.BaseSchema), schema_1.SizeSchema), { aGroup: (0, schema_1.AttributeSpec)('float32', 1, 0), aPosition: (0, schema_1.AttributeSpec)('float32', 3, 0), aMapping: (0, schema_1.AttributeSpec)('float32', 2, 0), elements: (0, schema_1.ElementsSpec)('uint32'), padding: (0, schema_1.ValueSpec)('number'), dDoubleSided: (0, schema_1.DefineSpec)('boolean'), dIgnoreLight: (0, schema_1.DefineSpec)('boolean'), dXrayShaded: (0, schema_1.DefineSpec)('boolean') });
+exports.SpheresSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.BaseSchema), schema_1.SizeSchema), { aGroup: (0, schema_1.AttributeSpec)('float32', 1, 0), aPosition: (0, schema_1.AttributeSpec)('float32', 3, 0), aMapping: (0, schema_1.AttributeSpec)('float32', 2, 0), elements: (0, schema_1.ElementsSpec)('uint32'), padding: (0, schema_1.ValueSpec)('number'), dDoubleSided: (0, schema_1.DefineSpec)('boolean'), dIgnoreLight: (0, schema_1.DefineSpec)('boolean'), dXrayShaded: (0, schema_1.DefineSpec)('boolean'), uBumpFrequency: (0, schema_1.UniformSpec)('f'), uBumpAmplitude: (0, schema_1.UniformSpec)('f') });
 function SpheresRenderable(ctx, id, values, state, materialId) {
     var schema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.GlobalUniformSchema), schema_1.GlobalTextureSchema), schema_1.InternalSchema), exports.SpheresSchema);
     var internalValues = {

package/lib/commonjs/mol-gl/renderable/text.d.ts CHANGED Viewed

@@ -33,6 +33,7 @@ export declare const TextSchema: {
     uAlpha: UniformSpec<"f">;
     uMetalness: UniformSpec<"f">;
     uRoughness: UniformSpec<"f">;
+    uBumpiness: UniformSpec<"f">;
     uVertexCount: UniformSpec<"i">;
     uInstanceCount: UniformSpec<"i">;
     uGroupCount: UniformSpec<"i">;

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

@@ -17,6 +17,8 @@ export declare const TextureMeshSchema: {
     dIgnoreLight: DefineSpec<"boolean">;
     dXrayShaded: DefineSpec<"boolean">;
     dGeoTexture: DefineSpec<"boolean">;
+    uBumpFrequency: UniformSpec<"f">;
+    uBumpAmplitude: UniformSpec<"f">;
     meta: ValueSpec<"unknown">;
     dLightCount: DefineSpec<"number">;
     aInstance: import("./schema").AttributeSpec<"float32">;
@@ -24,6 +26,7 @@ export declare const TextureMeshSchema: {
     uAlpha: UniformSpec<"f">;
     uMetalness: UniformSpec<"f">;
     uRoughness: UniformSpec<"f">;
+    uBumpiness: UniformSpec<"f">;
     uVertexCount: UniformSpec<"i">;
     uInstanceCount: UniformSpec<"i">;
     uGroupCount: UniformSpec<"i">;

package/lib/commonjs/mol-gl/renderable/texture-mesh.js CHANGED Viewed

@@ -12,7 +12,7 @@ var render_item_1 = require("../webgl/render-item");
 var schema_1 = require("./schema");
 var shader_code_1 = require("../shader-code");
 var mol_util_1 = require("../../mol-util");
-exports.TextureMeshSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.BaseSchema), { uGeoTexDim: (0, schema_1.UniformSpec)('v2', 'buffered'), tPosition: (0, schema_1.TextureSpec)('texture', 'rgb', 'float', 'nearest'), tGroup: (0, schema_1.TextureSpec)('texture', 'alpha', 'float', 'nearest'), tNormal: (0, schema_1.TextureSpec)('texture', 'rgb', 'float', 'nearest'), dFlatShaded: (0, schema_1.DefineSpec)('boolean'), dDoubleSided: (0, schema_1.DefineSpec)('boolean'), dFlipSided: (0, schema_1.DefineSpec)('boolean'), dIgnoreLight: (0, schema_1.DefineSpec)('boolean'), dXrayShaded: (0, schema_1.DefineSpec)('boolean'), dGeoTexture: (0, schema_1.DefineSpec)('boolean'), meta: (0, schema_1.ValueSpec)('unknown') });
+exports.TextureMeshSchema = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.BaseSchema), { uGeoTexDim: (0, schema_1.UniformSpec)('v2', 'buffered'), tPosition: (0, schema_1.TextureSpec)('texture', 'rgb', 'float', 'nearest'), tGroup: (0, schema_1.TextureSpec)('texture', 'alpha', 'float', 'nearest'), tNormal: (0, schema_1.TextureSpec)('texture', 'rgb', 'float', 'nearest'), dFlatShaded: (0, schema_1.DefineSpec)('boolean'), dDoubleSided: (0, schema_1.DefineSpec)('boolean'), dFlipSided: (0, schema_1.DefineSpec)('boolean'), dIgnoreLight: (0, schema_1.DefineSpec)('boolean'), dXrayShaded: (0, schema_1.DefineSpec)('boolean'), dGeoTexture: (0, schema_1.DefineSpec)('boolean'), uBumpFrequency: (0, schema_1.UniformSpec)('f'), uBumpAmplitude: (0, schema_1.UniformSpec)('f'), meta: (0, schema_1.ValueSpec)('unknown') });
 function TextureMeshRenderable(ctx, id, values, state, materialId) {
     var schema = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, schema_1.GlobalUniformSchema), schema_1.GlobalTextureSchema), schema_1.InternalSchema), exports.TextureMeshSchema);
     var internalValues = {

package/lib/commonjs/mol-gl/shader/chunks/apply-light-color.glsl.d.ts CHANGED Viewed

@@ -6,4 +6,4 @@
  * adapted from three.js (https://github.com/mrdoob/three.js/)
  * which under the MIT License, Copyright © 2010-2021 three.js authors
  */
-export declare const apply_light_color = "\n// inputs\n// - vec4 material\n// - vec3 vViewPosition\n// - vec3 normal\n// - float uMetalness\n// - float uRoughness\n// - vec3 uLightColor\n// - vec3 uAmbientColor\n\n// outputs\n// - sets gl_FragColor\n\nvec4 color = material;\n\nReflectedLight reflectedLight = ReflectedLight(vec3(0.0), vec3(0.0), vec3(0.0), vec3(0.0));\n\nPhysicalMaterial physicalMaterial;\nphysicalMaterial.diffuseColor = color.rgb * (1.0 - metalness);\nphysicalMaterial.roughness = max(roughness, 0.0525);\nphysicalMaterial.specularColor = mix(vec3(0.04), color.rgb, metalness);\nphysicalMaterial.specularF90 = 1.0;\n\nGeometricContext geometry;\ngeometry.position = -vViewPosition;\ngeometry.normal = normal;\ngeometry.viewDir = normalize(vViewPosition);\n\nIncidentLight directLight;\n#pragma unroll_loop_start\nfor (int i = 0; i < dLightCount; ++i) {\n    directLight.direction = uLightDirection[i];\n    directLight.color = uLightColor[i] * PI; // * PI for punctual light\n    RE_Direct_Physical(directLight, geometry, physicalMaterial, reflectedLight);\n}\n#pragma unroll_loop_end\n\nvec3 irradiance = uAmbientColor * PI; // * PI for punctual light\nRE_IndirectDiffuse_Physical(irradiance, geometry, physicalMaterial, reflectedLight);\n\n// indirect specular only metals\nvec3 radiance = uAmbientColor * metalness;\nvec3 iblIrradiance = uAmbientColor * metalness;\nvec3 clearcoatRadiance = vec3(0.0);\nRE_IndirectSpecular_Physical(radiance, iblIrradiance, clearcoatRadiance, geometry, physicalMaterial, reflectedLight);\n\nvec3 outgoingLight = reflectedLight.directDiffuse + reflectedLight.indirectDiffuse + reflectedLight.directSpecular + reflectedLight.indirectSpecular;\n\ngl_FragColor = vec4(outgoingLight, color.a);\n\n#ifdef dXrayShaded\n    gl_FragColor.a *= 1.0 - pow(abs(dot(normal, vec3(0.0, 0.0, 1.0))), uXrayEdgeFalloff);\n#endif\n";
+export declare const apply_light_color = "\n#ifdef bumpEnabled\n    if (uBumpFrequency > 0.0 && uBumpAmplitude > 0.0) {\n        vec3 bumpNormal = perturbNormal(-vViewPosition, normal, fbm(vModelPosition * uBumpFrequency), (uBumpAmplitude * bumpiness) / uBumpFrequency);\n        #ifdef enabledFragDepth\n            if (!any(isNaN(bumpNormal))) normal = bumpNormal;\n        #else\n            normal = bumpNormal;\n        #endif\n    }\n#endif\n\nvec4 color = material;\n\nReflectedLight reflectedLight = ReflectedLight(vec3(0.0), vec3(0.0), vec3(0.0), vec3(0.0));\n\nPhysicalMaterial physicalMaterial;\nphysicalMaterial.diffuseColor = color.rgb * (1.0 - metalness);\n#ifdef enabledFragDepth\n    physicalMaterial.roughness = min(max(roughness, 0.0525), 1.0);\n#else\n    vec3 dxy = max(abs(dFdx(normal)), abs(dFdy(normal)));\n    float geometryRoughness = max(max(dxy.x, dxy.y), dxy.z);\n    physicalMaterial.roughness = min(max(roughness, 0.0525) + geometryRoughness, 1.0);\n#endif\nphysicalMaterial.specularColor = mix(vec3(0.04), color.rgb, metalness);\nphysicalMaterial.specularF90 = 1.0;\n\nGeometricContext geometry;\ngeometry.position = -vViewPosition;\ngeometry.normal = normal;\ngeometry.viewDir = normalize(vViewPosition);\n\nIncidentLight directLight;\n#pragma unroll_loop_start\nfor (int i = 0; i < dLightCount; ++i) {\n    directLight.direction = uLightDirection[i];\n    directLight.color = uLightColor[i] * PI; // * PI for punctual light\n    RE_Direct_Physical(directLight, geometry, physicalMaterial, reflectedLight);\n}\n#pragma unroll_loop_end\n\nvec3 irradiance = uAmbientColor * PI; // * PI for punctual light\nRE_IndirectDiffuse_Physical(irradiance, geometry, physicalMaterial, reflectedLight);\n\n// indirect specular only metals\nvec3 radiance = uAmbientColor * metalness;\nvec3 iblIrradiance = uAmbientColor * metalness;\nvec3 clearcoatRadiance = vec3(0.0);\nRE_IndirectSpecular_Physical(radiance, iblIrradiance, clearcoatRadiance, geometry, physicalMaterial, reflectedLight);\n\nvec3 outgoingLight = reflectedLight.directDiffuse + reflectedLight.indirectDiffuse + reflectedLight.directSpecular + reflectedLight.indirectSpecular;\n\ngl_FragColor = vec4(outgoingLight, color.a);\n\n#ifdef dXrayShaded\n    gl_FragColor.a *= 1.0 - pow(abs(dot(normal, vec3(0.0, 0.0, 1.0))), uXrayEdgeFalloff);\n#endif\n";

package/lib/commonjs/mol-gl/shader/chunks/apply-light-color.glsl.js CHANGED Viewed

@@ -9,5 +9,5 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apply_light_color = void 0;
-exports.apply_light_color = "\n// inputs\n// - vec4 material\n// - vec3 vViewPosition\n// - vec3 normal\n// - float uMetalness\n// - float uRoughness\n// - vec3 uLightColor\n// - vec3 uAmbientColor\n\n// outputs\n// - sets gl_FragColor\n\nvec4 color = material;\n\nReflectedLight reflectedLight = ReflectedLight(vec3(0.0), vec3(0.0), vec3(0.0), vec3(0.0));\n\nPhysicalMaterial physicalMaterial;\nphysicalMaterial.diffuseColor = color.rgb * (1.0 - metalness);\nphysicalMaterial.roughness = max(roughness, 0.0525);\nphysicalMaterial.specularColor = mix(vec3(0.04), color.rgb, metalness);\nphysicalMaterial.specularF90 = 1.0;\n\nGeometricContext geometry;\ngeometry.position = -vViewPosition;\ngeometry.normal = normal;\ngeometry.viewDir = normalize(vViewPosition);\n\nIncidentLight directLight;\n#pragma unroll_loop_start\nfor (int i = 0; i < dLightCount; ++i) {\n    directLight.direction = uLightDirection[i];\n    directLight.color = uLightColor[i] * PI; // * PI for punctual light\n    RE_Direct_Physical(directLight, geometry, physicalMaterial, reflectedLight);\n}\n#pragma unroll_loop_end\n\nvec3 irradiance = uAmbientColor * PI; // * PI for punctual light\nRE_IndirectDiffuse_Physical(irradiance, geometry, physicalMaterial, reflectedLight);\n\n// indirect specular only metals\nvec3 radiance = uAmbientColor * metalness;\nvec3 iblIrradiance = uAmbientColor * metalness;\nvec3 clearcoatRadiance = vec3(0.0);\nRE_IndirectSpecular_Physical(radiance, iblIrradiance, clearcoatRadiance, geometry, physicalMaterial, reflectedLight);\n\nvec3 outgoingLight = reflectedLight.directDiffuse + reflectedLight.indirectDiffuse + reflectedLight.directSpecular + reflectedLight.indirectSpecular;\n\ngl_FragColor = vec4(outgoingLight, color.a);\n\n#ifdef dXrayShaded\n    gl_FragColor.a *= 1.0 - pow(abs(dot(normal, vec3(0.0, 0.0, 1.0))), uXrayEdgeFalloff);\n#endif\n";
+exports.apply_light_color = "\n#ifdef bumpEnabled\n    if (uBumpFrequency > 0.0 && uBumpAmplitude > 0.0) {\n        vec3 bumpNormal = perturbNormal(-vViewPosition, normal, fbm(vModelPosition * uBumpFrequency), (uBumpAmplitude * bumpiness) / uBumpFrequency);\n        #ifdef enabledFragDepth\n            if (!any(isNaN(bumpNormal))) normal = bumpNormal;\n        #else\n            normal = bumpNormal;\n        #endif\n    }\n#endif\n\nvec4 color = material;\n\nReflectedLight reflectedLight = ReflectedLight(vec3(0.0), vec3(0.0), vec3(0.0), vec3(0.0));\n\nPhysicalMaterial physicalMaterial;\nphysicalMaterial.diffuseColor = color.rgb * (1.0 - metalness);\n#ifdef enabledFragDepth\n    physicalMaterial.roughness = min(max(roughness, 0.0525), 1.0);\n#else\n    vec3 dxy = max(abs(dFdx(normal)), abs(dFdy(normal)));\n    float geometryRoughness = max(max(dxy.x, dxy.y), dxy.z);\n    physicalMaterial.roughness = min(max(roughness, 0.0525) + geometryRoughness, 1.0);\n#endif\nphysicalMaterial.specularColor = mix(vec3(0.04), color.rgb, metalness);\nphysicalMaterial.specularF90 = 1.0;\n\nGeometricContext geometry;\ngeometry.position = -vViewPosition;\ngeometry.normal = normal;\ngeometry.viewDir = normalize(vViewPosition);\n\nIncidentLight directLight;\n#pragma unroll_loop_start\nfor (int i = 0; i < dLightCount; ++i) {\n    directLight.direction = uLightDirection[i];\n    directLight.color = uLightColor[i] * PI; // * PI for punctual light\n    RE_Direct_Physical(directLight, geometry, physicalMaterial, reflectedLight);\n}\n#pragma unroll_loop_end\n\nvec3 irradiance = uAmbientColor * PI; // * PI for punctual light\nRE_IndirectDiffuse_Physical(irradiance, geometry, physicalMaterial, reflectedLight);\n\n// indirect specular only metals\nvec3 radiance = uAmbientColor * metalness;\nvec3 iblIrradiance = uAmbientColor * metalness;\nvec3 clearcoatRadiance = vec3(0.0);\nRE_IndirectSpecular_Physical(radiance, iblIrradiance, clearcoatRadiance, geometry, physicalMaterial, reflectedLight);\n\nvec3 outgoingLight = reflectedLight.directDiffuse + reflectedLight.indirectDiffuse + reflectedLight.directSpecular + reflectedLight.indirectSpecular;\n\ngl_FragColor = vec4(outgoingLight, color.a);\n\n#ifdef dXrayShaded\n    gl_FragColor.a *= 1.0 - pow(abs(dot(normal, vec3(0.0, 0.0, 1.0))), uXrayEdgeFalloff);\n#endif\n";
 //# sourceMappingURL=apply-light-color.glsl.js.map