Update app.py

app.py

@@ -35,19 +35,19 @@ def load_aframe_and_extras():
     """
 
 # 🏗️ Create A-Frame entities for each file type
-def create_aframe_entity(file_path, file_type, position):
+def create_aframe_entity(file_stem, file_type, position):
     rotation = f"0 {random.uniform(0, 360)} 0"
     bounce_speed = f"{random.uniform(0.05, 0.1)} {random.uniform(0.05, 0.1)} {random.uniform(0.05, 0.1)}"
     bounce_dist = f"0.1 0.1 0.1"
     
     if file_type == 'obj':
-        return f'<a-entity position="{position}" rotation="{rotation}" scale="0.5 0.5 0.5" obj-model="obj: #{Path(file_path).stem}" class="raycastable" draggable bouncing="speed: {bounce_speed}; dist: {bounce_dist}"></a-entity>'
+        return f'<a-entity position="{position}" rotation="{rotation}" scale="0.5 0.5 0.5" obj-model="obj: #{file_stem}" class="raycastable" draggable bouncing="speed: {bounce_speed}; dist: {bounce_dist}"></a-entity>'
     elif file_type == 'glb':
-        return f'<a-entity position="{position}" rotation="{rotation}" scale="0.5 0.5 0.5" gltf-model="#{Path(file_path).stem}" class="raycastable" draggable bouncing="speed: {bounce_speed}; dist: {bounce_dist}"></a-entity>'
+        return f'<a-entity position="{position}" rotation="{rotation}" scale="0.5 0.5 0.5" gltf-model="#{file_stem}" class="raycastable" draggable bouncing="speed: {bounce_speed}; dist: {bounce_dist}"></a-entity>'
     elif file_type in ['webp', 'png']:
-        return f'<a-image position="{position}" rotation="-90 0 0" src="#{Path(file_path).stem}" width="0.5" height="0.5" class="raycastable" draggable bouncing="speed: {bounce_speed}; dist: {bounce_dist}"></a-image>'
+        return f'<a-image position="{position}" rotation="-90 0 0" src="#{file_stem}" width="0.5" height="0.5" class="raycastable" draggable bouncing="speed: {bounce_speed}; dist: {bounce_dist}"></a-image>'
     elif file_type == 'mp4':
-        return f'<a-video position="{position}" rotation="-90 0 0" src="#{Path(file_path).stem}" width="0.5" height="0.5" class="raycastable" draggable bouncing="speed: {bounce_speed}; dist: {bounce_dist}"></a-video>'
+        return f'<a-video position="{position}" rotation="-90 0 0" src="#{file_stem}" width="0.5" height="0.5" class="raycastable" draggable bouncing="speed: {bounce_speed}; dist: {bounce_dist}"></a-video>'
     return ''
 
 # 🔐 Encode file contents to base64
@@ -58,33 +58,39 @@ def encode_file(file_path):
 
 # 🗺️ Generate tilemap grid
 @st.cache_data
-def generate_tilemap(files, directory, grid_width, grid_height):
+def generate_tilemap(files, directory, grid_width, grid_height, max_unique_models=5):
     assets = "<a-assets>"
     entities = ""
     tile_size = 1
     start_x = -(grid_width * tile_size) / 2
     start_z = -(grid_height * tile_size) / 2
 
+    # Limit the number of unique models
+    unique_files = random.sample(files, min(len(files), max_unique_models))
+    encoded_files = {}
+
+    for file in unique_files:
+        file_path = os.path.join(directory, file)
+        file_type = file.split('.')[-1]
+        encoded_file = encode_file(file_path)
+        encoded_files[file] = encoded_file
+        
+        if file_type in ['obj', 'glb']:
+            assets += f'<a-asset-item id="{Path(file).stem}" src="data:application/octet-stream;base64,{encoded_file}"></a-asset-item>'
+        elif file_type in ['webp', 'png', 'mp4']:
+            mime_type = f"image/{file_type}" if file_type in ['webp', 'png'] else "video/mp4"
+            assets += f'<{file_type} id="{Path(file).stem}" src="data:{mime_type};base64,{encoded_file}"></{file_type}>'
+
     for i in range(grid_width):
         for j in range(grid_height):
             x = start_x + (i * tile_size)
             z = start_z + (j * tile_size)
             position = f"{x} 0 {z}"
             
-            if files:
-                file = random.choice(files)
-                file_path = os.path.join(directory, file)
+            if unique_files:
+                file = random.choice(unique_files)
                 file_type = file.split('.')[-1]
-                
-                if file not in assets:
-                    encoded_file = encode_file(file_path)
-                    if file_type in ['obj', 'glb']:
-                        assets += f'<a-asset-item id="{Path(file).stem}" src="data:application/octet-stream;base64,{encoded_file}"></a-asset-item>'
-                    elif file_type in ['webp', 'png', 'mp4']:
-                        mime_type = f"image/{file_type}" if file_type in ['webp', 'png'] else "video/mp4"
-                        assets += f'<{file_type} id="{Path(file).stem}" src="data:{mime_type};base64,{encoded_file}"></{file_type}>'
-                
-                entities += create_aframe_entity(file_path, file_type, position)
+                entities += create_aframe_entity(Path(file).stem, file_type, position)
 
     assets += "</a-assets>"
     return assets, entities
@@ -113,8 +119,8 @@ def main():
             st.button("➡️", on_click=lambda: st.session_state.update({'camera_move': 'right'}))
         
         st.markdown("### 🗺️ Grid Size")
-        grid_width = st.slider("Grid Width", 1, 10, 10)
-        grid_height = st.slider("Grid Height", 1, 7, 7)
+        grid_width = st.slider("Grid Width", 1, 8, 8)
+        grid_height = st.slider("Grid Height", 1, 5, 5)
         
         st.markdown("### ℹ️ Instructions")
         st.write("- Click and drag to move objects")
@@ -155,7 +161,7 @@ def main():
       <a-entity moving-light="color: #00CED1; speed: 0.05 0.06 0.07; bounds: 4 3 4" position="0 3 0"></a-entity>
     """
 
-    assets, entities = generate_tilemap(files, directory, grid_width, grid_height)
+    assets, entities = generate_tilemap(files, directory, grid_width, grid_height, max_unique_models=5)
     aframe_scene += assets + entities + "</a-scene>"
 
     camera_move = st.session_state.get('camera_move', None)