Update multiple mobile viewers

Author: GitHubDragonFly

viewers/templates/Mobile/MOBJ Viewer.html

@@ -783,6 +783,14 @@
               child.material.forEach( mtrl => {
                 set_texture_colorSpace( mtrl );
 
+                if ((mtrl.aoMap || mtrl.lightMap) && child.geometry.attributes.uv1 === undefined &&
+                  child.geometry.attributes.uv !== undefined) {
+
+                  child.geometry.setAttribute( 'uv1', child.geometry.attributes.uv );
+                  if (mtrl.aoMap) mtrl.aoMap.channel = 1;
+                  if (mtrl.lightMap) mtrl.lightMap.channel = 1;
+                }
+
                 mtrl.castShadow = true;
                 mtrl.receiveShadow = true;
                 mtrl.vertexColors = vertex_colors_enabled;
@@ -794,6 +802,14 @@
             } else {
               set_texture_colorSpace( child.material );
 
+              if ((child.material.aoMap || child.material.lightMap) && child.geometry.attributes.uv1 === undefined &&
+                child.geometry.attributes.uv !== undefined) {
+
+                child.geometry.setAttribute( 'uv1', child.geometry.attributes.uv );
+                if (child.material.aoMap) child.material.aoMap.channel = 1;
+                if (child.material.lightMap) child.material.lightMap.channel = 1;
+              }
+
               child.material.castShadow = true;
               child.material.receiveShadow = true;
               child.material.vertexColors = vertex_colors_enabled;

viewers/templates/Mobile/MOBJ WebGPU.html

@@ -2120,26 +2120,32 @@
 
             if (Array.isArray( child.material )) {
               child.material.forEach( mtrl => {
-                if (mtrl.aoMap && child.geometry.attributes.uv1 === undefined && child.geometry.attributes.uv !== undefined) {
+                set_texture_colorSpace( mtrl );
+
+                if ((mtrl.aoMap || mtrl.lightMap) && child.geometry.attributes.uv1 === undefined &&
+                  child.geometry.attributes.uv !== undefined) {
+
                   child.geometry.setAttribute( 'uv1', child.geometry.attributes.uv );
-                  mtrl.aoMap.channel = 1;
+                  if (mtrl.aoMap) mtrl.aoMap.channel = 1;
+                  if (mtrl.lightMap) mtrl.lightMap.channel = 1;
                 }
 
-                set_texture_colorSpace( mtrl );
-
                 mtrl.vertexColors = child.geometry.hasAttribute( 'color' );
                 if (child.isPoints) mtrl.size = isMobile === true ? 0.8 : 1.25;
 
                 mtrl.needsUpdate = true;
               });
             } else {
-              if (child.material.aoMap && child.geometry.attributes.uv1 === undefined && child.geometry.attributes.uv !== undefined) {
+              set_texture_colorSpace( child.material );
+
+              if ((child.material.aoMap || child.material.lightMap) && child.geometry.attributes.uv1 === undefined &&
+                child.geometry.attributes.uv !== undefined) {
+
                 child.geometry.setAttribute( 'uv1', child.geometry.attributes.uv );
-                child.material.aoMap.channel = 1;
+                if (child.material.aoMap) child.material.aoMap.channel = 1;
+                if (child.material.lightMap) child.material.lightMap.channel = 1;
               }
 
-              set_texture_colorSpace( child.material );
-
               child.material.vertexColors = child.geometry.hasAttribute( 'color' );
               if (child.isPoints) child.material.size = isMobile === true ? 0.8 : 1.25;