Update app.py

app.py

@@ -15,7 +15,7 @@ def scan_assets():
         and not any(tag in f.lower() for tag in ("bump", "normal"))
     ]
 
-    # Bump/NORMAL map (just take the first one, if any)
+    # Bump/NORMAL map (take the first one, if any)
     bump_maps = [
         f for f in files
         if f.lower().endswith(img_exts)
@@ -27,7 +27,11 @@ def scan_assets():
 
     # OBJ models + their MTL partners
     obj_models = [f for f in files if f.lower().endswith(".obj")]
-    mtl_files  = {os.path.splitext(f)[0]: f for f in files if f.lower().endswith(".mtl")}
+    mtl_files  = {
+        os.path.splitext(f)[0]: f
+        for f in files
+        if f.lower().endswith(".mtl")
+    }
 
     models = []
     idx = 0
@@ -35,13 +39,13 @@ def scan_assets():
     # Register glTF entries
     for gltf in gltf_models:
         models.append({
-            "type": "gltf",
+            "type":     "gltf",
             "asset_id": f"model{idx}",
-            "src":     gltf
+            "src":      gltf
         })
         idx += 1
 
-    # Register OBJ entries (with optional MTL)
+    # Register OBJ entries
     for obj in obj_models:
         base = os.path.splitext(obj)[0]
         mtl = mtl_files.get(base)
@@ -58,15 +62,15 @@ def scan_assets():
     return textures, bump_maps, models
 
 def main():
-    st.title("🔳 A-Frame Tilemap with Random 3D Models")
+    st.title("🔳 A-Frame Tilemap with Mixed 3D Models")
     grid_size = st.sidebar.slider("Grid Size", 1, 20, 10)
 
     textures, bump_maps, models = scan_assets()
     if not textures or not models:
-        st.warning("⚠️ Drop at least one image (jpg/png) **and** one glb/obj model (with optional mtl) into this folder.")
+        st.warning("⚠️ Drop at least one .jpg/.png and one .glb/.obj (with optional .mtl) in this folder.")
         return
 
-    # Build <a-assets>
+    # --- Build <a-assets> ---
     asset_tags = []
     for i, tex in enumerate(textures):
         asset_tags.append(f'<img id="tex{i}" src="{tex}">')
@@ -76,42 +80,51 @@ def main():
 
     for m in models:
         if m["type"] == "gltf":
-            asset_tags.append(f'<a-asset-item id="{m["asset_id"]}" src="{m["src"]}"></a-asset-item>')
+            asset_tags.append(
+                f'<a-asset-item id="{m["asset_id"]}" src="{m["src"]}"></a-asset-item>'
+            )
         else:
-            asset_tags.append(f'<a-asset-item id="{m["obj_id"]}" src="{m["obj"]}"></a-asset-item>')
+            asset_tags.append(
+                f'<a-asset-item id="{m["obj_id"]}" src="{m["obj"]}"></a-asset-item>'
+            )
             if m["mtl_id"]:
-                asset_tags.append(f'<a-asset-item id="{m["mtl_id"]}" src="{m["mtl"]}"></a-asset-item>')
+                asset_tags.append(
+                    f'<a-asset-item id="{m["mtl_id"]}" src="{m["mtl"]}"></a-asset-item>'
+                )
 
     assets_html = "\n          ".join(asset_tags)
 
-    # JS arrays
+    # JS arrays for textures & models
     tex_js = ", ".join(f'"#tex{i}"' for i in range(len(textures)))
-    has_bump = "true" if bump_maps else "false"
-    models_js = []
+    models_js_elems = []
     for m in models:
         if m["type"] == "gltf":
-            models_js.append(f'{{type:"gltf", id:"#%s"}}' % m["asset_id"])
+            models_js_elems.append(f'{{type:"gltf", id:"#{m["asset_id"]}"}}')
         else:
-            mtl_part = f', mtl:"#%s"' % m["mtl_id"] if m["mtl_id"] else ""
-            models_js.append(f'{{type:"obj", obj:"#%s"{mtl}}}' % (m["obj_id"], mtl=mtl_part))
-    models_js = ", ".join(models_js)
-
-    # Ground material
+            if m["mtl_id"]:
+                models_js_elems.append(
+                    f'{{type:"obj", obj:"#{m["obj_id"]}", mtl:"#{m["mtl_id"]}"}}'
+                )
+            else:
+                models_js_elems.append(
+                    f'{{type:"obj", obj:"#{m["obj_id"]}"}}'
+                )
+    models_js = ", ".join(models_js_elems)
+
+    # Ground material (with optional bump)
     if bump_maps:
         ground_mat = "ground.setAttribute('material','color:#228B22; bumpMap:#bump0; bumpScale:0.2');"
     else:
         ground_mat = "ground.setAttribute('material','color:#228B22');"
 
-    # Final HTML
+    # --- Final HTML ---
     html = f"""
 <!DOCTYPE html>
 <html>
   <head>
     <meta charset="utf-8">
     <title>Tilemap Scene</title>
-    <!-- Core A-Frame -->
     <script src="https://aframe.io/releases/1.2.0/aframe.min.js"></script>
-    <!-- Loaders for OBJ & glTF -->
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/aframe-extras.loaders.min.js"></script>
   </head>
   <body>
@@ -122,13 +135,13 @@ def main():
 
       <!-- Lights -->
       <a-entity light="type: ambient; color: #BBB"></a-entity>
-      <a-entity light="type: directional; color: #FFF; intensity: 0.6" position="1 1 0"></a-entity>
-      <a-entity light="type: point; intensity: 0.6" position="0 5 0"></a-entity>
+      <a-entity light="type: directional; color: #FFF; intensity:0.6" position="1 1 0"></a-entity>
+      <a-entity light="type: point; intensity:0.6" position="0 5 0"></a-entity>
 
       <!-- Camera -->
       <a-entity camera look-controls position="0 {grid_size} {grid_size}"></a-entity>
 
-      <!-- Container -->
+      <!-- Tiles & Models -->
       <a-entity id="tilemap"></a-entity>
     </a-scene>