Update multiple viewers

Author: GitHubDragonFly

viewers/templates/OBJ Viewer.html

@@ -348,7 +348,7 @@
         height: 50vh;
         top: 50vh;
         left: 25vw;
-        padding: 10px;
+        padding: 5px;
         border: none;
       }
 
@@ -363,7 +363,7 @@
         height: 50vh;
         top: 50vh;
         left: 25vw;
-        padding: 10px;
+        padding: 5px;
         border: none;
       }
 
@@ -842,7 +842,7 @@
         const arrow_keys = [ 'ArrowUp', 'ArrowDown', 'ArrowRight', 'ArrowLeft' ];
 
         window.addEventListener( 'pointerdown', ( event ) => { if (progress.value === 0) mouse_down = true; }, false);
-        window.addEventListener( 'pointerup', ( event ) => { mouse_down = false; }, false);
+        window.addEventListener( 'pointerup', ( event ) => { mouse_down = false; if (progress.value === 0) mouse_wheel = true; }, false);
         window.addEventListener( 'wheel', ( event ) => { if (progress.value === 0) mouse_wheel = true; }, false);
         window.addEventListener( 'keydown', ( event ) => {
           if (progress.value === 0) {

viewers/templates/OBJ WebGPU.html

@@ -314,7 +314,7 @@
 
             const hd = ( value.toLowerCase().endsWith( '.exr' ) || value.toLowerCase().endsWith( '.hdr' ) );
 
-            const texParams = scope.getTextureParams( original_mat[ prop ] );
+            const texParams = scope.getTextureParams( original_mat[ prop ], params );
             const map = scope.loadTexture( resolveURL( scope.baseUrl, value ) );
 
             map.repeat.copy( texParams.scale );
@@ -399,14 +399,6 @@
                 setMapForType( 'displacementMap', value, lprop );
                 break;
 
-              case 'disp_b':
-                params.displacementBias = parseFloat( value );
-                break;
-
-              case 'disp_s':
-                params.displacementScale = parseFloat( value );
-                break;
-
               case 'pli':
                 params.lightMapIntensity = parseFloat( value );
                 break;
@@ -692,7 +684,7 @@
           return this.materials[ materialName ];
         }
 
-        getTextureParams( value ) {
+        getTextureParams( value, matParams ) {
           const texParams = {
             scale: new THREE.Vector2( 1, 1 ),
             offset: new THREE.Vector2( 0, 0 ),
@@ -728,6 +720,14 @@
             items.splice( pos, 2 );
           }
 
+          pos = items.indexOf( '-mm' );
+
+          if ( pos >= 0 ) {
+            matParams.displacementBias = parseFloat( items[ pos + 1 ] );
+            matParams.displacementScale = parseFloat( items[ pos + 2 ] );
+            items.splice( pos, 3 );
+          }
+
           pos = items.indexOf( '-r' );
 
           if ( pos >= 0 ) {
@@ -1529,7 +1529,7 @@
         height: 50vh;
         top: 50vh;
         left: 25vw;
-        padding: 10px;
+        padding: 5px;
         border: none;
       }
 
@@ -1544,7 +1544,7 @@
         height: 50vh;
         top: 50vh;
         left: 25vw;
-        padding: 10px;
+        padding: 5px;
         border: none;
       }