Add shader textureBias

src/graphics/program-lib/chunks/ao.frag.js

@@ -7,7 +7,7 @@ void applyAO() {
     dAo = 1.0;
 
     #ifdef MAPTEXTURE
-    dAo *= texture2D(texture_aoMap, $UV).$CH;
+    dAo *= texture2D(texture_aoMap, $UV, globalTextureBias).$CH;
     #endif
 
     #ifdef MAPVERTEX

src/graphics/program-lib/chunks/base.frag.js

@@ -3,6 +3,8 @@ uniform vec3 view_position;
 
 uniform vec3 light_globalAmbient;
 
+uniform float globalTextureBias;
+
 float square(float x) {
     return x*x;
 }

src/graphics/program-lib/chunks/diffuse.frag.js

@@ -15,7 +15,7 @@ void getAlbedo() {
     #endif
 
     #ifdef MAPTEXTURE
-    dAlbedo *= gammaCorrectInput(addAlbedoDetail(texture2D(texture_diffuseMap, $UV).$CH));
+    dAlbedo *= gammaCorrectInput(addAlbedoDetail(texture2D(texture_diffuseMap, $UV, globalTextureBias).$CH));
     #endif
 
     #ifdef MAPVERTEX

src/graphics/program-lib/chunks/metalness.frag.js

@@ -21,7 +21,7 @@ void getSpecularity() {
     #endif
 
     #ifdef MAPTEXTURE
-    metalness *= texture2D(texture_metalnessMap, $UV).$CH;
+    metalness *= texture2D(texture_metalnessMap, $UV, globalTextureBias).$CH;
     #endif
 
     #ifdef MAPVERTEX

src/graphics/program-lib/chunks/normalDetailMap.frag.js

@@ -13,7 +13,7 @@ vec3 blendNormals(vec3 n1, vec3 n2) {
 
 vec3 addNormalDetail(vec3 normalMap) {
     #ifdef MAPTEXTURE
-    vec3 normalDetailMap = unpackNormal(texture2D(texture_normalDetailMap, $UV));
+    vec3 normalDetailMap = unpackNormal(texture2D(texture_normalDetailMap, $UV, globalTextureBias));
     normalDetailMap = normalize(mix(vec3(0.0, 0.0, 1.0), normalDetailMap, material_normalDetailMapBumpiness));
     return blendNormals(normalMap, normalDetailMap);
     #else

src/graphics/program-lib/chunks/normalMap.frag.js

@@ -3,7 +3,7 @@ uniform sampler2D texture_normalMap;
 uniform float material_bumpiness;
 
 void getNormal() {
-    vec3 normalMap = unpackNormal(texture2D(texture_normalMap, $UV));
+    vec3 normalMap = unpackNormal(texture2D(texture_normalMap, $UV, globalTextureBias));
     normalMap = normalize(mix(vec3(0.0, 0.0, 1.0), normalMap, material_bumpiness));
     dNormalMap = addNormalDetail(normalMap);
     dNormalW = dTBN * dNormalMap;

src/graphics/program-lib/chunks/normalMapFast.frag.js

@@ -2,7 +2,7 @@ export default /* glsl */`
 uniform sampler2D texture_normalMap;
 
 void getNormal() {
-    vec3 normalMap = unpackNormal(texture2D(texture_normalMap, $UV));
+    vec3 normalMap = unpackNormal(texture2D(texture_normalMap, $UV, globalTextureBias));
     dNormalMap = addNormalDetail(normalMap);
     dNormalW = dTBN * dNormalMap;
 }

src/graphics/program-lib/chunks/opacity.frag.js

@@ -15,7 +15,7 @@ void getOpacity() {
     #endif
 
     #ifdef MAPTEXTURE
-    dAlpha *= texture2D(texture_opacityMap, $UV).$CH;
+    dAlpha *= texture2D(texture_opacityMap, $UV, globalTextureBias).$CH;
     #endif
 
     #ifdef MAPVERTEX

src/graphics/program-lib/chunks/parallax.frag.js

@@ -5,7 +5,7 @@ uniform float material_heightMapFactor;
 void getParallax() {
     float parallaxScale = material_heightMapFactor;
 
-    float height = texture2D(texture_heightMap, $UV).$CH;
+    float height = texture2D(texture_heightMap, $UV, globalTextureBias).$CH;
     height = height * parallaxScale - parallaxScale*0.5;
     vec3 viewDirT = dViewDirW * dTBN;
 

src/graphics/program-lib/chunks/reflectionEnv.frag.js

@@ -18,7 +18,7 @@ float shinyMipLevel(vec2 uv) {
     // calculate min of both sets of dF to handle discontinuity at the azim edge
     float maxd = min(max(dot(dx, dx), dot(dy, dy)), max(dot(dx2, dx2), dot(dy2, dy2)));
 
-    return clamp(0.5 * log2(maxd) - 1.0, 0.0, 6.0);
+    return clamp(0.5 * log2(maxd) - 1.0 + globalTextureBias, 0.0, 6.0);
 }
 
 vec3 calcReflection(vec3 tReflDirW, float tGlossiness) {

src/graphics/program-lib/chunks/specular.frag.js

@@ -15,7 +15,7 @@ void getSpecularity() {
     #endif
 
     #ifdef MAPTEXTURE
-    dSpecularity *= texture2D(texture_specularMap, $UV).$CH;
+    dSpecularity *= texture2D(texture_specularMap, $UV, globalTextureBias).$CH;
     #endif
 
     #ifdef MAPVERTEX

src/graphics/webgl/webgl-graphics-device.js

@@ -568,6 +568,9 @@ class WebglGraphicsDevice extends GraphicsDevice {
         }
 
         this.constantTexSource = this.scope.resolve("source");
+        this.globalTextureBias = this.scope.resolve("globalTextureBias");
+
+        this.globalTextureBias.setValue(0.0);
 
         if (this.extTextureFloat) {
             if (this.webgl2) {
@@ -608,9 +611,7 @@ class WebglGraphicsDevice extends GraphicsDevice {
 
         // set to false during rendering when grabTexture is unavailable (when rendering shadows ..)
         this.grabPassAvailable = true;
-
         this.grabPass = new GrabPass(this, options.alpha);
-        this.grabPass.create();
 
         // area light LUT format - order of preference: half, float, 8bit
         this.areaLightLutFormat = PIXELFORMAT_R8_G8_B8_A8;
@@ -628,8 +629,6 @@ class WebglGraphicsDevice extends GraphicsDevice {
         super.destroy();
         const gl = this.gl;
 
-        this.grabPass.destroy();
-
         if (this.webgl2 && this.feedback) {
             gl.deleteTransformFeedback(this.feedback);
         }
@@ -763,6 +762,7 @@ class WebglGraphicsDevice extends GraphicsDevice {
             // Note that Firefox exposes EXT_disjoint_timer_query under WebGL2 rather than
             // EXT_disjoint_timer_query_webgl2
             this.extDisjointTimerQuery = getExtension('EXT_disjoint_timer_query_webgl2', 'EXT_disjoint_timer_query');
+            this.extDepthTexture = true;
         } else {
             this.extBlendMinmax = getExtension("EXT_blend_minmax");
             this.extDrawBuffers = getExtension('EXT_draw_buffers');
@@ -791,6 +791,7 @@ class WebglGraphicsDevice extends GraphicsDevice {
             }
             this.extColorBufferFloat = null;
             this.extDisjointTimerQuery = null;
+            this.extDepthTexture = gl.getExtension('WEBGL_depth_texture');
         }
 
         this.extDebugRendererInfo = getExtension('WEBGL_debug_renderer_info');
@@ -1004,9 +1005,6 @@ class WebglGraphicsDevice extends GraphicsDevice {
             shader.loseContext();
         }
 
-        // grab pass
-        this.grabPass.destroy();
-
         // release textures
         for (const texture of this.textures) {
             texture.loseContext();
@@ -1045,8 +1043,6 @@ class WebglGraphicsDevice extends GraphicsDevice {
         for (const buffer of this.buffers) {
             buffer.unlock();
         }
-
-        this.grabPass.create();
     }
 
     /**

src/index.js

@@ -58,6 +58,7 @@ export { shFromCubemap } from './graphics/prefilter-cubemap.js';
 export { reprojectTexture } from './graphics/reproject-texture.js';
 export { programlib } from './graphics/program-lib/program-lib.js';
 export { shaderChunks } from './graphics/program-lib/chunks/chunks.js';
+export { GrabPass } from './graphics/grab-pass.js';
 export { GraphicsDevice } from './graphics/graphics-device.js';
 export { EnvLighting } from './graphics/env-lighting.js';
 export { IndexBuffer } from './graphics/index-buffer.js';

src/resources/parser/glb-parser.js

@@ -899,7 +899,7 @@ const createMaterial = function (gltfMaterial, textures) {
         "#endif",
         "",
         "#ifdef MAPTEXTURE",
-        "    dGlossiness *= texture2D(texture_glossMap, $UV).$CH;",
+        "    dGlossiness *= texture2D(texture_glossMap, $UV, globalTextureBias).$CH;",
         "#endif",
         "",
         "#ifdef MAPVERTEX",
@@ -929,7 +929,7 @@ const createMaterial = function (gltfMaterial, textures) {
         "    #endif",
         "",
         "    #ifdef MAPTEXTURE",
-        "        vec3 srgb = texture2D(texture_specularMap, $UV).$CH;",
+        "        vec3 srgb = texture2D(texture_specularMap, $UV, globalTextureBias).$CH;",
         "        dSpecularity *= vec3(pow(srgb.r, 2.2), pow(srgb.g, 2.2), pow(srgb.b, 2.2));",
         "    #endif",
         "",
@@ -956,7 +956,7 @@ const createMaterial = function (gltfMaterial, textures) {
         "#endif",
         "",
         "#ifdef MAPTEXTURE",
-        "    ccGlossiness *= texture2D(texture_clearCoatGlossMap, $UV).$CH;",
+        "    ccGlossiness *= texture2D(texture_clearCoatGlossMap, $UV, globalTextureBias).$CH;",
         "#endif",
         "",
         "#ifdef MAPVERTEX",