playcanvas · mvaligursky · May 13, 2024 · May 13, 2024 · May 13, 2024 · May 13, 2024
diff --git a/src/framework/handlers/cubemap.js b/src/framework/handlers/cubemap.js
@@ -121,7 +121,6 @@ class CubemapHandler extends ResourceHandler {
                             height: tex.height >> i,
                             format: tex.format,
                             levels: [tex._levels[i]],
-                            fixCubemapSeams: true,
                             addressU: ADDRESS_CLAMP_TO_EDGE,
                             addressV: ADDRESS_CLAMP_TO_EDGE,
                             // generate cubemaps on the top level only
@@ -180,8 +179,7 @@ class CubemapHandler extends ResourceHandler {
                     magFilter: assetData.hasOwnProperty('magFilter') ? assetData.magFilter : faceTextures[0].magFilter,
                     anisotropy: assetData.hasOwnProperty('anisotropy') ? assetData.anisotropy : 1,
                     addressU: ADDRESS_CLAMP_TO_EDGE,
-                    addressV: ADDRESS_CLAMP_TO_EDGE,
-                    fixCubemapSeams: !!assets[0]
+                    addressV: ADDRESS_CLAMP_TO_EDGE
                 });
 
                 resources[0] = faces;

diff --git a/src/platform/graphics/texture.js b/src/platform/graphics/texture.js
@@ -140,8 +140,6 @@ class Texture {
      * - {@link TEXTURETYPE_SWIZZLEGGGR}
      *
      * Defaults to {@link TEXTURETYPE_DEFAULT}.
-     * @param {boolean} [options.fixCubemapSeams] - Specifies whether this cubemap texture requires
-     * special seam fixing shader code to look right. Defaults to false.
      * @param {boolean} [options.flipY] - Specifies whether the texture should be flipped in the
      * Y-direction. Only affects textures with a source that is an image, canvas or video element.
      * Does not affect cubemaps, compressed textures or textures set from raw pixel data. Defaults
@@ -215,7 +213,6 @@ class Texture {
 
         this._storage = options.storage ?? false;
         this._cubemap = options.cubemap ?? false;
-        this.fixCubemapSeams = options.fixCubemapSeams ?? false;
         this._flipY = options.flipY ?? false;
         this._premultiplyAlpha = options.premultiplyAlpha ?? false;
 

diff --git a/src/scene/graphics/env-lighting.js b/src/scene/graphics/env-lighting.js
@@ -9,8 +9,6 @@ import {
 } from '../../platform/graphics/constants.js';
 import { DebugGraphics } from '../../platform/graphics/debug-graphics.js';
 
-const fixCubemapSeams = true;
-
 // calculate the number of mipmap levels given texture dimensions
 const calcLevels = (width, height = 0) => {
     return 1 + Math.floor(Math.log2(Math.max(width, height)));
@@ -46,7 +44,6 @@ const createCubemap = (device, size, format, mipmaps) => {
         type: format === PIXELFORMAT_RGBA8 ? RGBA8_TYPE : TEXTURETYPE_DEFAULT,
         addressU: ADDRESS_CLAMP_TO_EDGE,
         addressV: ADDRESS_CLAMP_TO_EDGE,
-        fixCubemapSeams: fixCubemapSeams,
         mipmaps: !!mipmaps
     });
 };
@@ -108,7 +105,6 @@ class EnvLighting {
             type: format === PIXELFORMAT_RGBA8 ? RGBA8_TYPE : TEXTURETYPE_DEFAULT,
             addressU: ADDRESS_CLAMP_TO_EDGE,
             addressV: ADDRESS_CLAMP_TO_EDGE,
-            fixCubemapSeams: false,
             mipmaps: true
         });
 

diff --git a/src/scene/graphics/reproject-texture.js b/src/scene/graphics/reproject-texture.js
@@ -500,8 +500,8 @@ function reprojectTexture(source, target, options = {}) {
     const params = [
         0,
         specularPower,
-        source.fixCubemapSeams ? 1.0 / source.width : 0.0,          // source seam scale
-        target.fixCubemapSeams ? 1.0 / target.width : 0.0           // target seam scale
+        0.0,          // source seam scale
+        0.0           // target seam scale
     ];
 
     const params2 = [

diff --git a/src/scene/materials/lit-material-options-builder.js b/src/scene/materials/lit-material-options-builder.js
@@ -99,7 +99,6 @@ class LitMaterialOptionsBuilder {
         litOptions.fog = material.useFog ? scene.fog : 'none';
         litOptions.gamma = material.useGammaTonemap ? scene.gammaCorrection : GAMMA_NONE;
         litOptions.toneMap = material.useGammaTonemap ? scene.toneMapping : -1;
-        litOptions.fixSeams = false;
 
         // source of reflections
         if (material.useSkybox && scene.envAtlas && scene.skybox) {

diff --git a/src/scene/materials/standard-material-options-builder.js b/src/scene/materials/standard-material-options-builder.js
@@ -301,7 +301,6 @@ class StandardMaterialOptionsBuilder {
         options.litOptions.fog = stdMat.useFog ? scene.fog : 'none';
         options.litOptions.gamma = stdMat.useGammaTonemap ? scene.gammaCorrection : GAMMA_NONE;
         options.litOptions.toneMap = stdMat.useGammaTonemap ? scene.toneMapping : -1;
-        options.litOptions.fixSeams = (stdMat.cubeMap ? stdMat.cubeMap.fixCubemapSeams : false);
 
         const isPhong = stdMat.shadingModel === SPECULAR_PHONG;
 

diff --git a/src/scene/materials/standard-material.js b/src/scene/materials/standard-material.js
@@ -993,9 +993,7 @@ function _defineTex2D(name, channel = "rgb", vertexColor = true, uv = 0) {
         defaultValue: null,
         dirtyShaderFunc: (oldValue, newValue) => {
             return !!oldValue !== !!newValue ||
-                oldValue && (oldValue.type !== newValue.type ||
-                             oldValue.fixCubemapSeams !== newValue.fixCubemapSeams ||
-                             oldValue.format !== newValue.format);
+                oldValue && (oldValue.type !== newValue.type || oldValue.format !== newValue.format);
         }
     });
 

diff --git a/src/scene/shader-lib/chunks/chunks.js b/src/scene/shader-lib/chunks/chunks.js
@@ -45,8 +45,6 @@ import extensionPS from './lit/frag/extension.js';
 import extensionVS from './lit/vert/extension.js';
 import falloffInvSquaredPS from './lit/frag/falloffInvSquared.js';
 import falloffLinearPS from './lit/frag/falloffLinear.js';
-import fixCubemapSeamsNonePS from './common/frag/fixCubemapSeamsNone.js';
-import fixCubemapSeamsStretchPS from './common/frag/fixCubemapSeamsStretch.js';
 import floatUnpackingPS from './lit/frag/float-unpacking.js';
 import fogExpPS from './lit/frag/fogExp.js';
 import fogExp2PS from './lit/frag/fogExp2.js';
@@ -255,8 +253,6 @@ const shaderChunks = {
     extensionVS,
     falloffInvSquaredPS,
     falloffLinearPS,
-    fixCubemapSeamsNonePS,
-    fixCubemapSeamsStretchPS,
     floatUnpackingPS,
     fogExpPS,
     fogExp2PS,

diff --git a/src/scene/shader-lib/chunks/common/frag/fixCubemapSeamsNone.js b/src/scene/shader-lib/chunks/common/frag/fixCubemapSeamsNone.js
diff --git a/src/scene/shader-lib/chunks/common/frag/fixCubemapSeamsStretch.js b/src/scene/shader-lib/chunks/common/frag/fixCubemapSeamsStretch.js
diff --git a/src/scene/shader-lib/chunks/lit/frag/reflectionCube.js b/src/scene/shader-lib/chunks/lit/frag/reflectionCube.js
@@ -3,7 +3,7 @@ uniform samplerCube texture_cubeMap;
 uniform float material_reflectivity;
 
 vec3 calcReflection(vec3 reflDir, float gloss) {
-    vec3 lookupVec = fixSeams(cubeMapProject(reflDir));
+    vec3 lookupVec = cubeMapProject(reflDir);
     lookupVec.x *= -1.0;
     return $DECODE(textureCube(texture_cubeMap, lookupVec));
 }

diff --git a/src/scene/shader-lib/chunks/lit/frag/reflectionEnvHQ.js b/src/scene/shader-lib/chunks/lit/frag/reflectionEnvHQ.js
@@ -15,7 +15,7 @@ vec3 calcReflection(vec3 reflDir, float gloss) {
     float ilevel = floor(level);
     float flevel = level - ilevel;
 
-    vec3 sharp = $DECODE_CUBEMAP(textureCube(texture_cubeMap, fixSeams(dir)));
+    vec3 sharp = $DECODE_CUBEMAP(textureCube(texture_cubeMap, dir));
     vec3 roughA = $DECODE(texture2D(texture_envAtlas, mapRoughnessUv(uv, ilevel)));
     vec3 roughB = $DECODE(texture2D(texture_envAtlas, mapRoughnessUv(uv, ilevel + 1.0)));
 

diff --git a/src/scene/shader-lib/chunks/skybox/frag/skyboxHDR.js b/src/scene/shader-lib/chunks/skybox/frag/skyboxHDR.js
@@ -26,7 +26,7 @@ void main(void) {
     #endif
 
     dir.x *= -1.0;
-    vec3 linear = SKYBOX_DECODE_FNC(textureCube(texture_cubeMap, fixSeamsStatic(dir, SKYBOX_MIP)));
+    vec3 linear = SKYBOX_DECODE_FNC(textureCube(texture_cubeMap, dir));
     gl_FragColor = vec4(gammaCorrectOutput(toneMap(processEnvironment(linear))), 1.0);
 }
 `;
diff --git a/src/scene/shader-lib/programs/lit-shader-options.js b/src/scene/shader-lib/programs/lit-shader-options.js
@@ -266,14 +266,6 @@ class LitShaderOptions {
      */
     toneMap = -1;
 
-    /**
-     * If cubemaps require seam fixing (see the `fixCubemapSeams` property of the options object
-     * passed to the {@link Texture} constructor).
-     *
-     * @type {boolean}
-     */
-    fixSeams = false;
-
     /**
      * One of "envAtlasHQ", "envAtlas", "cubeMap", "sphereMap".
      *

diff --git a/src/scene/shader-lib/programs/lit-shader.js b/src/scene/shader-lib/programs/lit-shader.js
@@ -780,7 +780,6 @@ class LitShader {
         }
 
         if (options.reflectionSource === 'envAtlasHQ') {
-            func.append(options.fixSeams ? chunks.fixCubemapSeamsStretchPS : chunks.fixCubemapSeamsNonePS);
             func.append(chunks.envAtlasPS);
             func.append(chunks.reflectionEnvHQPS
                 .replace(/\$DECODE_CUBEMAP/g, ChunkUtils.decodeFunc(options.reflectionCubemapEncoding))
@@ -790,7 +789,6 @@ class LitShader {
             func.append(chunks.envAtlasPS);
             func.append(chunks.reflectionEnvPS.replace(/\$DECODE/g, ChunkUtils.decodeFunc(options.reflectionEncoding)));
         } else if (options.reflectionSource === 'cubeMap') {
-            func.append(options.fixSeams ? chunks.fixCubemapSeamsStretchPS : chunks.fixCubemapSeamsNonePS);
             func.append(chunks.reflectionCubePS.replace(/\$DECODE/g, ChunkUtils.decodeFunc(options.reflectionEncoding)));
         } else if (options.reflectionSource === 'sphereMap') {
             func.append(chunks.reflectionSpherePS.replace(/\$DECODE/g, ChunkUtils.decodeFunc(options.reflectionEncoding)));

diff --git a/src/scene/shader-lib/programs/skybox.js b/src/scene/shader-lib/programs/skybox.js
@@ -6,7 +6,7 @@
 import { ShaderGenerator } from './shader-generator.js';
 import { SKYTYPE_INFINITE } from '../../constants.js';

 const mip2size = [128, 64, /* 32 */ 16, 8, 4, 2];

 const fShader = `
    #include "decodePS"
@@ -15,7 +15,6 @@
     #include "envMultiplyPS"
 
     #ifdef SKY_CUBEMAP
-        #include "cubemapSeams"
         #include "skyboxHDRPS"
     #else
         #include "sphericalPS"
@@ -38,7 +37,6 @@
         if (options.skymesh !== SKYTYPE_INFINITE) defines.set('SKYMESH', '');
         if (options.type === 'cubemap') {
             defines.set('SKY_CUBEMAP', '');
-            defines.set('SKYBOX_MIP', (1 - 1 / mip2size[options.mip]).toString());
         }
 
         // includes
@@ -49,7 +47,6 @@
         includes.set('envMultiplyPS', shaderChunks.envMultiplyPS);
 
         if (options.type === 'cubemap') {
-            includes.set('cubemapSeams', options.mip ? shaderChunks.fixCubemapSeamsStretchPS : shaderChunks.fixCubemapSeamsNonePS);
             includes.set('skyboxHDRPS', shaderChunks.skyboxHDRPS);
         } else {
             includes.set('sphericalPS', shaderChunks.sphericalPS);

diff --git a/src/scene/skybox/sky-mesh.js b/src/scene/skybox/sky-mesh.js
@@ -45,8 +45,7 @@ class SkyMesh {
 
             if (texture.cubemap) {
                 options.type = 'cubemap';
-                options.mip = texture.fixCubemapSeams ? scene.skyboxMip : 0;
-                options.fixSeams = texture.fixCubemapSeams;
+                options.mip = scene.skyboxMip;
             } else {
                 options.type = 'envAtlas';
             }