Update multiple viewers

Author: GitHubDragonFly

viewers/templates/GLTF WebGPU.html

@@ -47,7 +47,7 @@
       var mouse_down, mouse_wheel, reset_rotation, events_initialized, wireframe_enabled;
       var gui, gui_set = false, guiExposure, params, toneMappingOptions, draco_material;
       var variants, variant_materials, current_variant, variants_available, link;
-      var ambientLight, directionalLight, isMobile, isNewiPad, isFirefoxNightly;
+      var ambientLight, directionalLight, isMobile, isNewiPad;
       var ww = window.innerWidth, wh = window.innerHeight, equi_enabled;
       var animation_running, extra_running, gif_export, object_is_points;
       var rot_x = 0, rot_y = 0, rot_z = 0, initial_rotation;
@@ -1923,11 +1923,27 @@
         mouse_wheel = true;
 
         let image_name = (document.getElementById('file_image_input').value).toUpperCase();
-        let exr = image_name.endsWith( '.EXR' );
-        let hdr = image_name.endsWith( '.HDR' );
-        let hd_gpu = ((exr === true || hdr === true) && gpu === true);
+        let exr = (image_name.endsWith( '.EXR' ) === true);
+        let hdr = (image_name.endsWith( '.HDR' ) === true);
+        let hd = (exr === true || hdr === true);
 
-        const options = { imageOrientation: (bg_flip === true ? (hd_gpu === false ? 'flipY' : 'none') : (hd_gpu === false ? 'none' : 'flipY')) };
+        let image_orientation;
+
+        if (bg_flip === true) {
+          if (hd === false) {
+            image_orientation = 'flipY';
+          } else {
+            image_orientation = 'none';
+          }
+        } else {
+          if (hd === false) {
+            image_orientation = 'none';
+          } else {
+            image_orientation = 'flipY';
+          }
+        }
+
+        const options = { imageOrientation: image_orientation };
         const imageBitmap = await createImageBitmap( scene_bgnd.image, options );
         const clone = new THREE.CanvasTexture( imageBitmap );
         clone.colorSpace = ((exr === true || hdr === true) ? THREE.LinearSRGBColorSpace : THREE.SRGBColorSpace);
@@ -5086,8 +5102,6 @@
         isNewiPad = (/iPad/.test( navigator.platform ) && (/Mac OS X/i.test( navigator.userAgent ))) ||
           (navigator.maxTouchPoints !== undefined && navigator.maxTouchPoints > 2 && /MacIntel/.test( navigator.platform ));
 
-        isFirefoxNightly = (gpu === true) && (/Firefox/i.test( navigator.userAgent )) && (/Gecko/i.test( navigator.userAgent ));
-
         isMobile = (isNewiPad === false) && ((/iPhone|iPad|iPod/.test( navigator.platform )) ||
           (/Android|webOS|iPhone|iPad|iPod|BlackBerry|CriOS|IEMobile|Opera Mini/i.test( navigator.userAgent )));
 

viewers/templates/OBJ WebGPU.html

@@ -2805,11 +2805,27 @@
         mouse_wheel = true;
 
         let image_name = (document.getElementById('file_image_input').value).toUpperCase();
-        let exr = image_name.endsWith( '.EXR' );
-        let hdr = image_name.endsWith( '.HDR' );
-        let hd_gpu = ((exr === true || hdr === true) && gpu === true);
+        let exr = (image_name.endsWith( '.EXR' ) === true);
+        let hdr = (image_name.endsWith( '.HDR' ) === true);
+        let hd = (exr === true || hdr === true);
 
-        const options = { imageOrientation: (bg_flip === true ? (hd_gpu === false ? 'flipY' : 'none') : (hd_gpu === false ? 'none' : 'flipY')) };
+        let image_orientation;
+
+        if (bg_flip === true) {
+          if (hd === false) {
+            image_orientation = 'flipY';
+          } else {
+            image_orientation = 'none';
+          }
+        } else {
+          if (hd === false) {
+            image_orientation = 'none';
+          } else {
+            image_orientation = 'flipY';
+          }
+        }
+
+        const options = { imageOrientation: image_orientation };
         const imageBitmap = await createImageBitmap( scene_bgnd.image, options );
         const clone = new THREE.CanvasTexture( imageBitmap );
         clone.colorSpace = ((exr === true || hdr === true) ? THREE.LinearSRGBColorSpace : THREE.SRGBColorSpace);

viewers/templates/PDB WebGPU.html

@@ -1631,11 +1631,27 @@
         mouse_wheel = true;
 
         let image_name = (document.getElementById('file_image_input').value).toUpperCase();
-        let exr = image_name.endsWith( '.EXR' );
-        let hdr = image_name.endsWith( '.HDR' );
-        let hd_gpu = ((exr === true || hdr === true) && gpu === true);
+        let exr = (image_name.endsWith( '.EXR' ) === true);
+        let hdr = (image_name.endsWith( '.HDR' ) === true);
+        let hd = (exr === true || hdr === true);
 
-        const options = { imageOrientation: (bg_flip === true ? (hd_gpu === false ? 'flipY' : 'none') : (hd_gpu === false ? 'none' : 'flipY')) };
+        let image_orientation;
+
+        if (bg_flip === true) {
+          if (hd === false) {
+            image_orientation = 'flipY';
+          } else {
+            image_orientation = 'none';
+          }
+        } else {
+          if (hd === false) {
+            image_orientation = 'none';
+          } else {
+            image_orientation = 'flipY';
+          }
+        }
+
+        const options = { imageOrientation: image_orientation };
         const imageBitmap = await createImageBitmap( scene_bgnd.image, options );
         const clone = new THREE.CanvasTexture( imageBitmap );
         clone.colorSpace = ((exr === true || hdr === true) ? THREE.LinearSRGBColorSpace : THREE.SRGBColorSpace);