@xviewer.js/core 1.0.0-alpha.60 → 1.0.0-alpha.62

package/dist/main.js

@@ -3073,7 +3073,7 @@ class Plane extends three.Mesh {
 }
 
 class Reflector extends Component {
-    constructor({ textureWidth = 512, textureHeight = 512, clipBias = 0, multisample = 4, layer = 0, normal = new three.Vector3(0, 0, 1), mipmap = false } = {}){
+    constructor({ textureWidth = 512, textureHeight = 512, clipBias = 0, multisample = 4, layer = 0, normal = new three.Vector3(0, 1, 0), mipmap = false } = {}){
         super();
         const reflectorPlane = new three.Plane();
         const reflectorNormal = new three.Vector3();
@@ -3347,10 +3347,11 @@ function getShaderMaterial(uniforms, vertexShader, fragmentShader, onInit) {
     return material;
 }
 
-const vert_Reflector = `
+const vert_Reflector = /*glsl*/ `
 uniform mat4 textureMatrix;
 varying vec4 vUv4;
 varying vec2 vUv;
+varying vec3 vPositionWS;
 
 #ifdef USE_UV1
     varying vec2 vUv1;
@@ -3380,9 +3381,6 @@ void main() {
     transformed = instanceMatrix * transformed;
 #endif
 
-    vec4 positionWS = modelMatrix * transformed;
-    vec4 mvPosition = viewMatrix * positionWS;
-
     vUv = uv;
 
 #ifdef USE_UV1   
@@ -3397,8 +3395,11 @@ void main() {
     vUv3 = uv2;
 #endif
 
-    vUv4 = textureMatrix * transformed;
+    vec4 positionWS = modelMatrix * transformed;
+    vec4 mvPosition = viewMatrix * positionWS;
 
+    vUv4 = textureMatrix * positionWS;
+    vPositionWS = positionWS.xyz;
     vViewPosition = -mvPosition.xyz;
     vNormal = normalize(transformedNormal);
 
@@ -3407,7 +3408,7 @@ void main() {
     #include <logdepthbuf_vertex>
 }
 `;
-const frag_Reflector = `
+const frag_Reflector = /*glsl*/ `
 uniform vec3      color;
 uniform float     alpha;
 uniform float     roughness;
@@ -3419,7 +3420,9 @@ uniform sampler2D aoMap;
 uniform float     aoMapIntensity;
 uniform sampler2D lightMap;
 uniform float     lightMapIntensity;
-uniform sampler2D tReflect;
+uniform sampler2D reflectMap;
+uniform float     reflectIntensity;
+varying vec3      vPositionWS;
 
 varying vec2 vUv;
 
@@ -3446,10 +3449,14 @@ varying vec3 vNormal;
 void main() {
     #include <logdepthbuf_fragment>
 
+    vec3 coord = vUv4.xyz / vUv4.w;
+    vec2 reflectUv = coord.xy;
+
+#ifdef USE_NORMALMAP
     vec4 texelNormal = texture2D(normalMap, UV_NORMAL);
     vec3 normal = normalize(vec3(texelNormal.r * 2.0 - 1.0, texelNormal.b,  texelNormal.g * 2.0 - 1.0));
-    vec3 coord = vUv4.xyz / vUv4.w;
-    vec2 reflectUv = coord.xy + coord.z * normal.xz * 0.05;
+    reflectUv += coord.z * normal.xz * 0.05;
+#endif
 
     vec3 geometryNormal = normalize(vNormal);
     vec3 geometryViewDir = normalize(vViewPosition);
@@ -3470,7 +3477,11 @@ void main() {
     vec3  specularColor = mix( vec3( 0.04 ), diffuseColor.rgb, metalnessFactor );
     float specularF90 = 1.0;
 
-    float roughnessFactor = texture2D(roughnessMap, UV_ROUGHNESS).g * roughness;
+    float roughnessFactor = roughness;
+
+#ifdef USE_ROUGHNESSMAP
+    roughnessFactor *= texture2D(roughnessMap, UV_ROUGHNESS).g * roughness;
+#endif
 
     computeMultiscattering( geometryNormal, geometryViewDir, specularColor, specularF90, roughnessFactor, singleScattering, multiScattering );
 
@@ -3478,10 +3489,13 @@ void main() {
 	vec3 diffuse = diffuseColor.rgb * ( 1.0 - max( max( totalScattering.r, totalScattering.g ), totalScattering.b ) );
 
     vec3 irradiance = vec3(0.);
+
+#ifdef USE_LIGHTMAP
     irradiance += texture2D(lightMap, UV_LIGHTMAP).rgb * lightMapIntensity;
+#endif
 
     float lod = roughnessFactor * (1.7 - 0.7 * roughnessFactor) * 6.;
-    vec4  reflectColor = textureLod(tReflect, reflectUv, lod);
+    vec4  reflectColor = textureLod(reflectMap, reflectUv, lod) * reflectIntensity;
 
     vec3 f_specular = vec3(0.);
     vec3 f_diffuse = vec3(0.);
@@ -3489,9 +3503,13 @@ void main() {
     f_specular += reflectColor.rgb * (1.0 - roughnessFactor * roughnessFactor) + multiScattering * irradiance;
     f_diffuse += diffuse * irradiance;
 
+#ifdef USE_AOMAP
     float ambientOcclusion = mix(1., texture2D(aoMap, UV_AO).r, aoMapIntensity);
+
     float dotNV = saturate( dot( geometryNormal, geometryViewDir ) );
     f_specular *= computeSpecularOcclusion(dotNV, ambientOcclusion, roughnessFactor);
+    f_diffuse *= ambientOcclusion;
+#endif
 
     gl_FragColor = vec4(f_specular + f_diffuse, diffuseColor.a);
 
@@ -3530,6 +3548,12 @@ class ReflectorMaterial extends three.ShaderMaterial {
             shader.defines[key] = "vUv" + channel;
         });
     }
+    get color() {
+        return this.uniforms.color.value;
+    }
+    set color(v) {
+        this.uniforms.color.value = v;
+    }
     get alpha() {
         return this.uniforms.alpha.value;
     }
@@ -3578,6 +3602,18 @@ class ReflectorMaterial extends three.ShaderMaterial {
     set lightMap(v) {
         this.uniforms.lightMap.value = v;
     }
+    get lightMapIntensity() {
+        return this.uniforms.lightMapIntensity.value;
+    }
+    set lightMapIntensity(v) {
+        this.uniforms.lightMapIntensity.value = v;
+    }
+    get reflectIntensity() {
+        return this.uniforms.reflectIntensity.value;
+    }
+    set reflectIntensity(v) {
+        this.uniforms.reflectIntensity.value = v;
+    }
     constructor(...args){
         super(...args);
         this.vertexShader = vert_Reflector;
@@ -3590,7 +3626,7 @@ class ReflectorMaterial extends three.ShaderMaterial {
         };
         this.uniforms = {
             color: {
-                value: new three.Color(0xffffff)
+                value: new three.Color()
             },
             alpha: {
                 value: 1
@@ -3598,9 +3634,12 @@ class ReflectorMaterial extends three.ShaderMaterial {
             map: {
                 value: null
             },
-            tReflect: {
+            reflectMap: {
                 value: null
             },
+            reflectIntensity: {
+                value: 1
+            },
             textureMatrix: {
                 value: new three.Matrix4()
             },
@@ -3631,6 +3670,9 @@ class ReflectorMaterial extends three.ShaderMaterial {
         };
     }
 }
+__decorate([
+    property
+], ReflectorMaterial.prototype, "color", null);
 __decorate([
     property({
         min: 0,
@@ -4447,6 +4489,54 @@ function applyProps(target, props) {
     }
     return target;
 }
+function find(node, path) {
+    let child = null;
+    let parts = path.split("/");
+    let children = node.children;
+    for (let part of parts){
+        child = children.find((v)=>v.name === part);
+        if (child) {
+            children = child.children;
+        } else {
+            return null;
+        }
+    }
+    return child;
+}
+function getObject(node, filter, group = false) {
+    const queue = [
+        node
+    ];
+    const objects = [];
+    while(queue.length !== 0){
+        let object = queue.shift();
+        let target = filter(object);
+        if (target) {
+            objects.push(object);
+            if (!group) {
+                break;
+            }
+        }
+        object.children.forEach((v)=>queue.push(v));
+    }
+    if (group) {
+        return objects;
+    }
+    return objects[0];
+}
+function getObjectByName(node, name) {
+    return getObject(node, (v)=>v && v.name === name);
+}
+const __emtpyObject = {};
+function getObjectValue(object, name, group = false) {
+    if (name) {
+        if (group) {
+            return Object.values(object || __emtpyObject).filter((v)=>v.name === name);
+        }
+        return Object.values(object || __emtpyObject).find((v)=>v.name === name);
+    }
+    return Object.values(object);
+}
 
 class PluginManager {
     get viewer() {
@@ -4562,62 +4652,6 @@ class Viewer extends EventEmitter {
         ], 2));
         return geometry;
     }
-    static findChild(node, path) {
-        let child = null;
-        let parts = path.split("/");
-        let children = node.children;
-        for (let part of parts){
-            child = children.find((v)=>v.name === part);
-            if (child) {
-                children = child.children;
-            } else {
-                return null;
-            }
-        }
-        return child;
-    }
-    static getChildByName(node, name) {
-        return Viewer.getObject(node, (v)=>v.name === name && v);
-    }
-    static getObject(node, filter, group = false) {
-        const queue = [
-            node
-        ];
-        const objects = [];
-        while(queue.length !== 0){
-            let object = queue.shift();
-            let target = filter(object);
-            if (target) {
-                objects.push(object);
-                if (!group) {
-                    break;
-                }
-            }
-            object.children.forEach((v)=>queue.push(v));
-        }
-        if (group) {
-            return objects;
-        }
-        return objects[0];
-    }
-    static _getObjectValue(object, name, group = false) {
-        if (name) {
-            if (group) {
-                return Object.values(object || Viewer.__emtpyObject).filter((v)=>v.name === name);
-            }
-            return Object.values(object || Viewer.__emtpyObject).find((v)=>v.name === name);
-        }
-        return Object.values(object);
-    }
-    static getMaterial(node, name, group = false) {
-        return Viewer._getObjectValue(node.userData.materials, name, group);
-    }
-    static getTexture(node, name, group = false) {
-        return Viewer._getObjectValue(node.userData.textures, name, group);
-    }
-    static getMesh(node, name, group = false) {
-        return Viewer._getObjectValue(node.userData.meshes, name, group);
-    }
     get root() {
         return this._root;
     }
@@ -4819,7 +4853,7 @@ class Viewer extends EventEmitter {
         this._tweenManager.killTweensOf(target);
     }
     traverseMaterials(callback) {
-        Viewer.getObject(this._scene, (item)=>{
+        getObject(this._scene, (item)=>{
             if (item.material) {
                 if (Array.isArray(item.material)) item.material.forEach(callback);
                 else callback(item.material);
@@ -5065,7 +5099,6 @@ Viewer._shadowCameraKeys = [
     "near",
     "far"
 ];
-Viewer.__emtpyObject = {};
 Viewer.fullscreenMesh = new three.Mesh(Viewer.createFullscreenTriangle());
 Viewer.fullscreenCamera = new three.OrthographicCamera(-1, 1, 1, -1, 0, 1);
 Viewer._instanceCount = 0;
@@ -5845,11 +5878,16 @@ exports.aHDRLoader = aHDRLoader;
 exports.aJSONLoader = aJSONLoader;
 exports.aLoader = aLoader;
 exports.aTextureLoader = aTextureLoader;
+exports.applyProps = applyProps;
 exports.exponentialDamp = exponentialDamp;
+exports.find = find;
 exports.frag_BoxfilterBlur = frag_BoxfilterBlur;
 exports.frag_cubeMapToPanorama = frag_cubeMapToPanorama;
 exports.frag_panoramaToCubeMap = frag_panoramaToCubeMap;
 exports.getClassInstance = getClassInstance;
+exports.getObject = getObject;
+exports.getObjectByName = getObjectByName;
+exports.getObjectValue = getObjectValue;
 exports.getShaderMaterial = getShaderMaterial;
 exports.mixin = mixin;
 exports.property = property;