@shapediver/viewer.rendering-engine.rendering-engine-threejs 3.3.4 → 3.3.6

package/src/materials/SpecularGlossinessMaterial.ts

@@ -1,182 +0,0 @@
-import * as THREE from 'three';
-import { MeshStandardMaterial, MeshStandardMaterialParameters } from 'three';
-
-export interface SpecularGlossinessMaterialParameters extends MeshStandardMaterialParameters {
-    // #region Properties (4)
-
-    glossiness?: number | undefined;
-    glossinessMap?: THREE.Texture | null | undefined;
-    specular?: THREE.ColorRepresentation | undefined;
-    specularMap2?: THREE.Texture | null | undefined;
-
-    // #endregion Properties (4)
-}
-
-export class SpecularGlossinessMaterial extends MeshStandardMaterial {
-    // #region Properties (1)
-
-    public isGLTFSpecularGlossinessMaterial: boolean;
-
-    // #endregion Properties (1)
-
-    // #region Constructors (1)
-
-    constructor(params: SpecularGlossinessMaterialParameters) {
-        super();
-
-        this.isGLTFSpecularGlossinessMaterial = true;
-
-        //various chunks that need replacing
-        const specularMap2ParsFragmentChunk = [
-            '#ifdef USE_SPECULARMAP2',
-            '	uniform sampler2D specularMap2;',
-            '#endif'
-        ].join('\n');
-
-        const glossinessMapParsFragmentChunk = [
-            '#ifdef USE_GLOSSINESSMAP',
-            '	uniform sampler2D glossinessMap;',
-            '#endif'
-        ].join('\n');
-
-        const specularMap2FragmentChunk = [
-            'vec3 specularFactor = specular;',
-            '#ifdef USE_SPECULARMAP2',
-            '	vec4 texelSpecular = texture2D( specularMap2, vUv );',
-            '	// reads channel RGB, compatible with a glTF Specular-Glossiness (RGBA) texture',
-            '	specularFactor *= texelSpecular.rgb;',
-            '#endif'
-        ].join('\n');
-
-        const glossinessMapFragmentChunk = [
-            'float glossinessFactor = glossiness;',
-            '#ifdef USE_GLOSSINESSMAP',
-            '	vec4 texelGlossiness = texture2D( glossinessMap, vUv );',
-            '	// reads channel A, compatible with a glTF Specular-Glossiness (RGBA) texture',
-            '	glossinessFactor *= texelGlossiness.a;',
-            '#endif'
-        ].join('\n');
-
-        const lightPhysicalFragmentChunk = [
-            'PhysicalMaterial material;',
-            'material.diffuseColor = diffuseColor.rgb * ( 1. - max( specularFactor.r, max( specularFactor.g, specularFactor.b ) ) );',
-            'vec3 dxy = max( abs( dFdx( nonPerturbedNormal  ) ), abs( dFdy( nonPerturbedNormal ) ) );',
-            'float geometryRoughness = max( max( dxy.x, dxy.y ), dxy.z );',
-            'material.roughness = max( 1.0 - glossinessFactor, 0.0525 ); // 0.0525 corresponds to the base mip of a 256 cubemap.',
-            'material.roughness += geometryRoughness;',
-            'material.roughness = min( material.roughness, 1.0 );',
-            'material.specularColor = specularFactor;',
-        ].join('\n');
-
-        const uniforms: { [key: string]: { value: any } } = {
-            specular: { value: new THREE.Color().setHex(0xffffff) },
-            glossiness: { value: 1 },
-            specularMap2: { value: null },
-            glossinessMap: { value: null }
-        };
-
-        (<any>this)._extraUniforms = uniforms;
-
-        this.onBeforeCompile = function (shader) {
-            for (const uniformName in uniforms) {
-                shader.uniforms[uniformName] = uniforms[uniformName];
-            }
-
-            shader.fragmentShader = shader.fragmentShader
-                .replace('uniform float roughness;', 'uniform vec3 specular;')
-                .replace('uniform float metalness;', 'uniform float glossiness;')
-                .replace('#include <roughnessmap_pars_fragment>', specularMap2ParsFragmentChunk)
-                .replace('#include <metalnessmap_pars_fragment>', glossinessMapParsFragmentChunk)
-                .replace('#include <roughnessmap_fragment>', specularMap2FragmentChunk)
-                .replace('#include <metalnessmap_fragment>', glossinessMapFragmentChunk)
-                .replace('#include <lights_physical_fragment>', lightPhysicalFragmentChunk);
-
-        };
-
-        Object.defineProperties(this, {
-            specular: {
-                get: function () {
-                    return uniforms.specular.value;
-
-                },
-                set: function (v) {
-                    uniforms.specular.value = v;
-                }
-            },
-
-            specularMap2: {
-                get: function () {
-                    return uniforms.specularMap2.value;
-
-                },
-                set: function (v) {
-                    uniforms.specularMap2.value = v;
-
-                    if (v) {
-                        this.defines.USE_SPECULARMAP2 = ''; // USE_UV is set by the renderer for specular maps
-
-                    } else {
-                        delete this.defines.USE_SPECULARMAP2;
-                    }
-                }
-            },
-
-            glossiness: {
-                get: function () {
-                    return uniforms.glossiness.value;
-
-                },
-                set: function (v) {
-                    uniforms.glossiness.value = v;
-                }
-            },
-
-            glossinessMap: {
-                get: function () {
-                    return uniforms.glossinessMap.value;
-
-                },
-                set: function (v) {
-                    uniforms.glossinessMap.value = v;
-
-                    if (v) {
-                        this.defines.USE_GLOSSINESSMAP = '';
-                        this.defines.USE_UV = '';
-
-                    } else {
-                        delete this.defines.USE_GLOSSINESSMAP;
-                        delete this.defines.USE_UV;
-                    }
-                }
-            }
-
-        });
-
-        delete (<any>this).metalness;
-        delete (<any>this).roughness;
-        delete (<any>this).metalnessMap;
-        delete (<any>this).roughnessMap;
-
-        this.setValues(params);
-    }
-
-    // #endregion Constructors (1)
-
-    // #region Public Methods (1)
-
-    public copy(source: SpecularGlossinessMaterial) {
-        super.copy(source);
-
-        (<any>this).specularMap2 = (<any>source).specularMap2;
-        (<any>this).specular.copy((<any>source).specular);
-        (<any>this).glossinessMap = (<any>source).glossinessMap;
-        (<any>this).glossiness = (<any>source).glossiness;
-        delete (<any>this).metalness;
-        delete (<any>this).roughness;
-        delete (<any>this).metalnessMap;
-        delete (<any>this).roughnessMap;
-        return this;
-    }
-
-    // #endregion Public Methods (1)
-}

package/src/objects/SDBone.ts

@@ -1,51 +0,0 @@
-import * as THREE from 'three'
-import { Bone } from 'three'
-import { mat4 } from 'gl-matrix'
-import { ISDObject } from '@shapediver/viewer.rendering-engine.rendering-engine';
-
-export class SDBone extends Bone implements ISDObject {
-    // #region Constructors (1)
-
-    #SDid: string;
-    #SDversion: string;
-
-    constructor(
-        SDid: string,
-        SDversion: string
-    ) {
-        super();
-        this.#SDid = SDid;
-        this.#SDversion = SDversion;
-    }
-    
-    public applyTransformation(transformation: mat4): void {
-        this.matrix.identity();
-        this.matrixWorld.identity();
-        this.position.set(0,0,0)
-        this.scale.set(1,1,1)
-        this.quaternion.set(0,0,0,1)
-        this.applyMatrix4(new THREE.Matrix4().fromArray(transformation));
-    }
-
-    // #endregion Constructors (1)
-
-    // #region Public Accessors (4)
-
-    public get SDid(): string {
-        return this.#SDid;
-    }
-
-    public set SDid(value: string) {
-        this.#SDid = value;
-    }
-
-    public get SDversion(): string {
-        return this.#SDversion;
-    }
-
-    public set SDversion(value: string) {
-        this.#SDversion = value;
-    }
-
-    // #endregion Public Accessors (4)
-}

package/src/objects/SDColor.ts

@@ -1,54 +0,0 @@
-import * as THREE from 'three'
-import { Color as ThreeColor } from 'three'
-import { Color } from '@shapediver/viewer.shared.types';
-
-export class SDColor extends ThreeColor {
-    // #region Properties (3)
-
-    private _colorSpace: 'srgb' | 'srgb-linear' = 'srgb-linear';
-    private _originalColorSpace: 'srgb' | 'srgb-linear' = 'srgb-linear';
-
-    // #endregion Properties (3)
-
-    // #region Constructors (1)
-
-    constructor(hexColor: string, originalColor: Color) {
-        super(hexColor);
-        if(typeof originalColor === 'number' || Array.isArray(originalColor) && (originalColor.length == 3 || originalColor.length == 4)) {
-            this._colorSpace = 'srgb-linear';
-            this._originalColorSpace = 'srgb-linear';
-        } else {
-            this._colorSpace = 'srgb';
-            this._originalColorSpace = 'srgb';
-        }
-    }
-
-    // #endregion Constructors (1)
-
-    // #region Public Methods (1)
-
-    /**
-     * Depending on the current state and provided value, this function converts the color to a different color space.
-     * 
-     * If the color is in 'srgb' space and active is set to true, it will be converted to 'srgb-linear' space.
-     * If the color is in 'srgb-linear' space, the color is not originally in 'srgb-linear' and active is set to false, it will be converted to 'srgb' space.
-     * 
-     * @param active 
-     */
-    public colorCorrection(active: boolean) {
-        if(this._colorSpace === 'srgb' && active === true) {
-            // we assume all colors provided are in 'srgb' color space
-            // therefore we need to correct those colors to 'srgb-linear' if the color conversion is active
-            this.convertSRGBToLinear();
-            this._colorSpace = 'srgb-linear';
-        } else if(this._colorSpace === 'srgb-linear' && active === false && this._originalColorSpace !== 'srgb-linear') {
-            // if the color space is already 'srgb-linear', the color was already converted
-            // therefore we need to convert it back if the color conversion was deactivted
-            // if it was not originally in 'srgb-linear'
-            this.convertLinearToSRGB();
-            this._colorSpace = 'srgb';
-        }
-    }
-
-    // #endregion Public Methods (1)
-}

package/src/objects/SDData.ts

@@ -1,44 +0,0 @@
-import { SDObject } from './SDObject';
-
-export enum SD_DATA_TYPE {
-    GEOMETRY = 'geometry',
-    MATERIAL = 'material',
-    THREEJS = 'threejs',
-    LIGHT = 'light',
-    CAMERA = 'camera',
-    ANIMATION = 'animation',
-    INTERACTION = 'interaction',
-    HTML_ELEMENT_ANCHOR = 'html_element_anchor',
-    CUSTOM = 'custom'
-}
-
-export class SDData extends SDObject {
-    // #region Properties (1)
-
-    #SDtype: SD_DATA_TYPE = SD_DATA_TYPE.CUSTOM;
-
-    // #endregion Properties (1)
-
-    // #region Constructors (1)
-
-    constructor(
-        SDid: string,
-        SDversion: string
-    ) {
-        super(SDid, SDversion);
-    }
-
-    // #endregion Constructors (1)
-
-    // #region Public Accessors (2)
-
-    public get SDtype(): SD_DATA_TYPE {
-        return this.#SDtype;
-    }
-
-    public set SDtype(value: SD_DATA_TYPE) {
-        this.#SDtype = value;
-    }
-
-    // #endregion Public Accessors (2)
-}

package/src/objects/SDObject.ts

@@ -1,58 +0,0 @@
-import * as THREE from 'three'
-import { Object3D } from 'three'
-import { mat4 } from 'gl-matrix'
-import { ISDObject } from '@shapediver/viewer.rendering-engine.rendering-engine';
-
-export class SDObject extends Object3D implements ISDObject {
-    // #region Constructors (1)
-
-    #SDid: string;
-    #SDversion: string;
-
-    constructor(
-        SDid: string,
-        SDversion: string
-    ) {
-        super();
-        this.#SDid = SDid;
-        this.#SDversion = SDversion;
-    }
-    
-    public applyTransformation(transformation: mat4): void {
-        this.matrix.identity();
-        this.matrixWorld.identity();
-        this.position.set(0,0,0)
-        this.scale.set(1,1,1)
-        this.quaternion.set(0,0,0,1)
-        this.applyMatrix4(new THREE.Matrix4().fromArray(transformation));
-    }
-
-    // #endregion Constructors (1)
-
-    // #region Public Accessors (4)
-
-    public get SDid(): string {
-        return this.#SDid;
-    }
-
-    public set SDid(value: string) {
-        this.#SDid = value;
-    }
-
-    public get SDversion(): string {
-        return this.#SDversion;
-    }
-
-    public set SDversion(value: string) {
-        this.#SDversion = value;
-    }
-
-    public cloneObject(): SDObject {
-        const clone = this.clone();
-        clone.SDid = this.SDid;
-        clone.SDversion = this.SDversion;
-        return clone;
-    }
-
-    // #endregion Public Accessors (4)
-}

package/src/shaders/PCSS.ts

@@ -1,124 +0,0 @@
-export const main = `
-
-uniform float lightSizeUV;
-uniform float blending;
-
-#ifdef SHADOWMAP_TYPE_PCF
-
-#define NEAR_PLANE 0.1
-#define NUM_SAMPLES 20
-#define NUM_RINGS 11
-
-vec2 poissonDisk[NUM_SAMPLES];
-
-void initPoissonSamples( const in vec2 randomSeed ) {
-    float ANGLE_STEP = PI2 * float(NUM_RINGS) / float(NUM_SAMPLES);
-    float INV_NUM_SAMPLES = 1.0 / float(NUM_SAMPLES);
-
-    // jsfiddle that shows sample pattern: https://jsfiddle.net/a16ff1p7/
-    float angle = rand(randomSeed) * PI2;
-    float radius = INV_NUM_SAMPLES;
-    float radiusStep = radius;
-
-    for (int i = 0; i < int(NUM_SAMPLES); i++ ) {
-        poissonDisk[i] = vec2(cos(angle), sin(angle)) * pow(radius, 0.75);
-        radius += radiusStep;
-        angle += ANGLE_STEP;
-    }
-}
-
-float penumbraSize( const in float zReceiver, const in float zBlocker ) { // Parallel plane estimation
-    return (zReceiver - zBlocker) / zBlocker;
-}
-
-float findBlocker(sampler2D shadowMap, const in vec2 uv, const in float zReceiver ) {
-    // This uses similar triangles to compute what
-    // area of the shadow map we should search
-    float searchRadius = lightSizeUV * (zReceiver - NEAR_PLANE) / zReceiver;
-    float blockerDepthSum = 0.0;
-    int numBlockers = 0;
-
-    for (int i = 0; i < int(NUM_SAMPLES); i++ ) {
-        float shadowMapDepth = unpackRGBAToDepth(texture2D(shadowMap, uv + poissonDisk[i] * searchRadius));
-        if (shadowMapDepth < zReceiver) {
-            blockerDepthSum += shadowMapDepth;
-            numBlockers++;
-        }
-    }
-
-    if (numBlockers == 0) return -1.0;
-
-    return blockerDepthSum / float(numBlockers);
-}
-
-float PCF_Filter(sampler2D shadowMap, vec2 uv, float zReceiver, float filterRadius) {
-    float sum = 0.0;
-    for (int i = 0; i < int(NUM_SAMPLES); i++ ) {
-        float depth = unpackRGBAToDepth(texture2D(shadowMap, uv + poissonDisk[i] * filterRadius));
-        if (zReceiver <= depth) sum += 1.0;
-    }
-    for (int i = 0; i < int(NUM_SAMPLES); i++ ) {
-        float depth = unpackRGBAToDepth(texture2D(shadowMap, uv + -poissonDisk[i].yx * filterRadius));
-        if (zReceiver <= depth) sum += 1.0;
-    }
-    return sum / (2.0 * float(NUM_SAMPLES));
-}
-
-float PCSS(sampler2D shadowMap, vec4 coords) {
-    vec2 uv = coords.xy;
-    float zReceiver = coords.z; // Assumed to be eye-space z in this code
-
-    initPoissonSamples(uv);
-    // STEP 1: blocker search
-    float avgBlockerDepth = findBlocker(shadowMap, uv, zReceiver);
-
-    //There are no occluders so early out (this saves filtering)
-    if (avgBlockerDepth == -1.0) return 1.0;
-
-    // STEP 2: penumbra size
-    float penumbraRatio = penumbraSize(zReceiver, avgBlockerDepth);
-    float filterRadius = penumbraRatio * lightSizeUV * NEAR_PLANE / zReceiver;
-
-    // STEP 3: filtering
-    //return avgBlockerDepth;
-    return PCF_Filter(shadowMap, uv, zReceiver, filterRadius);
-}
-#endif
-`;
-
-export const entry = `
-// PCSS implementation
-vec2 texelSize = vec2( 1.0 ) / shadowMapSize;
-float dx = texelSize.x;
-float dy = texelSize.y;
-vec2 uv = shadowCoord.xy;
-vec2 f = fract( uv * shadowMapSize + 0.5 );
-uv -= f * texelSize;
-float shadow1 = (
-    texture2DCompare( shadowMap, uv, shadowCoord.z ) +
-    texture2DCompare( shadowMap, uv + vec2( dx, 0.0 ), shadowCoord.z ) +
-    texture2DCompare( shadowMap, uv + vec2( 0.0, dy ), shadowCoord.z ) +
-    texture2DCompare( shadowMap, uv + texelSize, shadowCoord.z ) +
-    mix( texture2DCompare( shadowMap, uv + vec2( -dx, 0.0 ), shadowCoord.z ), 
-         texture2DCompare( shadowMap, uv + vec2( 2.0 * dx, 0.0 ), shadowCoord.z ),
-         f.x ) +
-    mix( texture2DCompare( shadowMap, uv + vec2( -dx, dy ), shadowCoord.z ), 
-         texture2DCompare( shadowMap, uv + vec2( 2.0 * dx, dy ), shadowCoord.z ),
-         f.x ) +
-    mix( texture2DCompare( shadowMap, uv + vec2( 0.0, -dy ), shadowCoord.z ), 
-         texture2DCompare( shadowMap, uv + vec2( 0.0, 2.0 * dy ), shadowCoord.z ),
-         f.y ) +
-    mix( texture2DCompare( shadowMap, uv + vec2( dx, -dy ), shadowCoord.z ), 
-         texture2DCompare( shadowMap, uv + vec2( dx, 2.0 * dy ), shadowCoord.z ),
-         f.y ) +
-    mix( mix( texture2DCompare( shadowMap, uv + vec2( -dx, -dy ), shadowCoord.z ), 
-              texture2DCompare( shadowMap, uv + vec2( 2.0 * dx, -dy ), shadowCoord.z ),
-              f.x ),
-         mix( texture2DCompare( shadowMap, uv + vec2( -dx, 2.0 * dy ), shadowCoord.z ), 
-              texture2DCompare( shadowMap, uv + vec2( 2.0 * dx, 2.0 * dy ), shadowCoord.z ),
-              f.x ),
-         f.y )
-) * ( 1.0 / 9.0 );
-float shadow2 = PCSS( shadowMap, shadowCoord );
-shadow = shadow1 * (1.0 - blending) + blending * shadow2;
-            `