Change behaviour of setPackState when passed undefined options to avo…

…id confusion This prevents calls to setPackState from influencing the packing state of all subsequently-loaded textures.
greggman · Sep 6, 2024 · f841cad · f841cad
1 parent a662680
commit f841cad
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 68 deletions.
diff --git a/dist/5.x/twgl-full.js b/dist/5.x/twgl-full.js
diff --git a/dist/5.x/twgl-full.js.map b/dist/5.x/twgl-full.js.map
diff --git a/dist/5.x/twgl-full.min.js b/dist/5.x/twgl-full.min.js
diff --git a/dist/5.x/twgl-full.module.js b/dist/5.x/twgl-full.module.js
@@ -5600,15 +5600,9 @@ function setDefaults$1(newDefaults) {
  * @private
  */
 function setPackState(gl, options) {
-  if (options.colorspaceConversion !== undefined) {
-    gl.pixelStorei(UNPACK_COLORSPACE_CONVERSION_WEBGL, options.colorspaceConversion);
-  }
-  if (options.premultiplyAlpha !== undefined) {
-    gl.pixelStorei(UNPACK_PREMULTIPLY_ALPHA_WEBGL, options.premultiplyAlpha);
-  }
-  if (options.flipY !== undefined) {
-    gl.pixelStorei(UNPACK_FLIP_Y_WEBGL, options.flipY);
-  }
+  gl.pixelStorei(UNPACK_COLORSPACE_CONVERSION_WEBGL, options.colorspaceConversion ?? 0);
+  gl.pixelStorei(UNPACK_PREMULTIPLY_ALPHA_WEBGL, options.premultiplyAlpha ?? 0);
+  gl.pixelStorei(UNPACK_FLIP_Y_WEBGL, options.flipY ?? 0);
 }
 
 /**

diff --git a/dist/5.x/twgl.js b/dist/5.x/twgl.js
diff --git a/dist/5.x/twgl.js.map b/dist/5.x/twgl.js.map
diff --git a/dist/5.x/twgl.min.js b/dist/5.x/twgl.min.js
diff --git a/dist/5.x/twgl.module.js b/dist/5.x/twgl.module.js
@@ -1694,15 +1694,9 @@ function setDefaults$1(newDefaults) {
  * @private
  */
 function setPackState(gl, options) {
-  if (options.colorspaceConversion !== undefined) {
-    gl.pixelStorei(UNPACK_COLORSPACE_CONVERSION_WEBGL, options.colorspaceConversion);
-  }
-  if (options.premultiplyAlpha !== undefined) {
-    gl.pixelStorei(UNPACK_PREMULTIPLY_ALPHA_WEBGL, options.premultiplyAlpha);
-  }
-  if (options.flipY !== undefined) {
-    gl.pixelStorei(UNPACK_FLIP_Y_WEBGL, options.flipY);
-  }
+  gl.pixelStorei(UNPACK_COLORSPACE_CONVERSION_WEBGL, options.colorspaceConversion ?? 0);
+  gl.pixelStorei(UNPACK_PREMULTIPLY_ALPHA_WEBGL, options.premultiplyAlpha ?? 0);
+  gl.pixelStorei(UNPACK_FLIP_Y_WEBGL, options.flipY ?? 0);
 }
 
 /**

diff --git a/npm/base/dist/5.x/twgl.js b/npm/base/dist/5.x/twgl.js
diff --git a/npm/base/dist/5.x/twgl.js.map b/npm/base/dist/5.x/twgl.js.map
diff --git a/npm/base/dist/5.x/twgl.module.js b/npm/base/dist/5.x/twgl.module.js
@@ -1694,15 +1694,9 @@ function setDefaults$1(newDefaults) {
  * @private
  */
 function setPackState(gl, options) {
-  if (options.colorspaceConversion !== undefined) {
-    gl.pixelStorei(UNPACK_COLORSPACE_CONVERSION_WEBGL, options.colorspaceConversion);
-  }
-  if (options.premultiplyAlpha !== undefined) {
-    gl.pixelStorei(UNPACK_PREMULTIPLY_ALPHA_WEBGL, options.premultiplyAlpha);
-  }
-  if (options.flipY !== undefined) {
-    gl.pixelStorei(UNPACK_FLIP_Y_WEBGL, options.flipY);
-  }
+  gl.pixelStorei(UNPACK_COLORSPACE_CONVERSION_WEBGL, options.colorspaceConversion ?? 0);
+  gl.pixelStorei(UNPACK_PREMULTIPLY_ALPHA_WEBGL, options.premultiplyAlpha ?? 0);
+  gl.pixelStorei(UNPACK_FLIP_Y_WEBGL, options.flipY ?? 0);
 }
 
 /**

diff --git a/src/textures.js b/src/textures.js
@@ -616,15 +616,9 @@ function setDefaults(newDefaults) {
  * @private
  */
 function setPackState(gl, options) {
-  if (options.colorspaceConversion !== undefined) {
-    gl.pixelStorei(UNPACK_COLORSPACE_CONVERSION_WEBGL, options.colorspaceConversion);
-  }
-  if (options.premultiplyAlpha !== undefined) {
-    gl.pixelStorei(UNPACK_PREMULTIPLY_ALPHA_WEBGL, options.premultiplyAlpha);
-  }
-  if (options.flipY !== undefined) {
-    gl.pixelStorei(UNPACK_FLIP_Y_WEBGL, options.flipY);
-  }
+  gl.pixelStorei(UNPACK_COLORSPACE_CONVERSION_WEBGL, options.colorspaceConversion ?? 0);
+  gl.pixelStorei(UNPACK_PREMULTIPLY_ALPHA_WEBGL, options.premultiplyAlpha ?? 0);
+  gl.pixelStorei(UNPACK_FLIP_Y_WEBGL, options.flipY ?? 0);
 }
 
 /**