@xviewer.js/core 1.0.0-alpha.25 → 1.0.0-alpha.27

package/dist/module.js

@@ -3180,7 +3180,19 @@ const vert_Reflector = `
 uniform mat4 textureMatrix;
 varying vec4 vUv4;
 varying vec2 vUv;
-varying vec2 vUv1;
+
+#ifdef USE_UV1
+    varying vec2 vUv1;
+#endif
+
+#ifdef USE_UV2
+    varying vec2 vUv2;
+#endif
+
+#ifdef USE_UV3
+    varying vec2 vUv3;
+#endif
+
 varying vec3 vViewPosition;
 
 #include <common>
@@ -3195,7 +3207,19 @@ void main() {
     vec4 mvPosition = viewMatrix * positionWS;
 
     vUv = uv;
+
+#ifdef USE_UV1   
     vUv1 = uv1;
+#endif
+
+#ifdef USE_UV2   
+    vUv2 = uv2;
+#endif
+
+#ifdef USE_UV3   
+    vUv3 = uv2;
+#endif
+
     vUv4 = textureMatrix * vec4(position, 1.0);
 
     vViewPosition = -mvPosition.xyz;
@@ -3213,13 +3237,25 @@ uniform sampler2D tDiffuse;
 uniform sampler2D normalMap;
 uniform sampler2D roughnessMap;
 uniform sampler2D aoMap;
-uniform float aoMapIntensity;
+uniform float     aoMapIntensity;
 uniform sampler2D lightMap;
-uniform float lightMapIntensity;
+uniform float     lightMapIntensity;
 
-varying vec4 vUv4;
 varying vec2 vUv;
-varying vec2 vUv1;
+
+#ifdef USE_UV1
+    varying vec2 vUv1;
+#endif
+
+#ifdef USE_UV2
+    varying vec2 vUv2;
+#endif
+
+#ifdef USE_UV3
+    varying vec2 vUv3;
+#endif
+
+varying vec4 vUv4;
 varying vec3 vViewPosition;
 varying vec3 vNormal;
 
@@ -3230,10 +3266,9 @@ varying vec3 vNormal;
 void main() {
     #include <logdepthbuf_fragment>
 
-    vec4 uv4 = vUv4;
-    vec4 texelNormal = texture2D(normalMap, vUv);
+    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 = uv4.xyz / uv4.w;
+    vec3 coord = vUv4.xyz / vUv4.w;
     vec2 reflectUv = coord.xy + coord.z * normal.xz * 0.05;
 
     vec3 geometryNormal = normalize(vNormal);
@@ -3247,7 +3282,7 @@ void main() {
     vec3  specularColor = mix( vec3( 0.04 ), diffuseColor.rgb, metalnessFactor );
     float specularF90 = 1.0;
 
-    float roughnessFactor = texture2D(roughnessMap, vUv).g * roughness;
+    float roughnessFactor = texture2D(roughnessMap, UV_ROUGHNESS).g * roughness;
 
     computeMultiscattering( geometryNormal, geometryViewDir, specularColor, specularF90, roughnessFactor, singleScattering, multiScattering );
 
@@ -3255,7 +3290,7 @@ void main() {
 	vec3 diffuse = diffuseColor * ( 1.0 - max( max( totalScattering.r, totalScattering.g ), totalScattering.b ) );
 
     vec3 irradiance = vec3(0.);
-    irradiance += texture2D(lightMap, vUv).rgb * lightMapIntensity;
+    irradiance += texture2D(lightMap, UV_LIGHTMAP).rgb * lightMapIntensity;
 
     float lod = roughnessFactor * (1.7 - 0.7 * roughnessFactor) * 6.;
     vec4  reflectColor = textureLod(tDiffuse, reflectUv, lod);
@@ -3266,7 +3301,7 @@ void main() {
     f_specular += reflectColor.rgb * (1.0 - roughnessFactor * roughnessFactor) + multiScattering * irradiance;
     f_diffuse += diffuse * irradiance;
 
-    float ambientOcclusion = mix(1., texture2D(aoMap, vUv1).r, aoMapIntensity);
+    float ambientOcclusion = mix(1., texture2D(aoMap, UV_AO).r, aoMapIntensity);
     float dotNV = saturate( dot( geometryNormal, geometryViewDir ) );
     f_specular *= computeSpecularOcclusion(dotNV, ambientOcclusion, roughnessFactor);
 
@@ -3277,6 +3312,36 @@ void main() {
 }
 `;
 class ReflectorMaterial extends ShaderMaterial {
+    onBeforeCompile(shader, renderer) {
+        const channels = [];
+        if (this.aoMap && this.aoMap.channel) {
+            channels.push([
+                "UV_AO",
+                this.aoMap.channel
+            ]);
+        }
+        if (this.lightMap && this.lightMap.channel) {
+            channels.push([
+                "UV_LIGHTMAP",
+                this.lightMap.channel
+            ]);
+        }
+        if (this.roughnessMap && this.roughnessMap.channel) {
+            channels.push([
+                "UV_ROUGHNESS",
+                this.roughnessMap.channel
+            ]);
+        }
+        if (this.normalMap && this.normalMap.channel) {
+            channels.push([
+                "UV_NORMAL",
+                this.normalMap.channel
+            ]);
+        }
+        channels.forEach(([key, channel])=>{
+            shader.defines[key] = "vUv" + channel;
+        });
+    }
     get metalness() {
         return this.uniforms.metalness.value;
     }
@@ -3294,29 +3359,39 @@ class ReflectorMaterial extends ShaderMaterial {
     }
     set roughnessMap(v) {
         this.uniforms.roughnessMap.value = v;
+        this.needsUpdate = true;
     }
     get normalMap() {
         return this.uniforms.normalMap.value;
     }
     set normalMap(v) {
         this.uniforms.normalMap.value = v;
+        this.needsUpdate = true;
     }
     get aoMap() {
         return this.uniforms.aoMap.value;
     }
     set aoMap(v) {
         this.uniforms.aoMap.value = v;
+        this.needsUpdate = true;
     }
     get lightMap() {
         return this.uniforms.lightMap.value;
     }
     set lightMap(v) {
         this.uniforms.lightMap.value = v;
+        this.needsUpdate = true;
     }
     constructor(...args){
         super(...args);
         this.vertexShader = vert_Reflector;
         this.fragmentShader = frag_Reflector;
+        this.defines = {
+            UV_AO: "vUv",
+            UV_LIGHTMAP: "vUv",
+            UV_ROUGHNESS: "vUv",
+            UV_NORMAL: "vUv"
+        };
         this.uniforms = {
             color: {
                 value: new Color(0xffffff)
@@ -4377,6 +4452,9 @@ class Viewer extends EventEmitter {
     get rootRotated() {
         return this._rootRotated;
     }
+    get input() {
+        return this._input;
+    }
     destroy() {
         this._renderer.dispose();
         this._taskManager.destroy();
@@ -5008,6 +5086,7 @@ class EnvironmentPlugin extends Plugin {
         this._reflectPass.envMapIntensity = this.envMapIntensity;
         this._mipBlurPass.exposure = this.reflectExposure;
         this._mipBlurPass.blurIntensity = this.reflectBlurIntensity;
+        renderer.autoClear = true;
         this._cubeCamera.update(renderer, this._scene);
         this._reflectPass.mergeReflect(this._mergeInfo);
         this._mipBlurPass.mergeMipBlur(this._mergeInfo);