Update app.py

app.py

@@ -10,7 +10,37 @@ def load_aframe_and_extras():
     <script>
     let score = 0;
     AFRAME.registerComponent('draggable', {
-      // ... (previous draggable component code)
+      init: function () {
+        this.el.setAttribute('class', 'raycastable');
+        this.el.setAttribute('cursor-listener', '');
+        this.dragHandler = this.dragMove.bind(this);
+        this.el.sceneEl.addEventListener('mousemove', this.dragHandler);
+        this.el.addEventListener('mousedown', this.onDragStart.bind(this));
+        this.el.addEventListener('mouseup', this.onDragEnd.bind(this));
+        this.camera = document.querySelector('[camera]');
+      },
+      remove: function () {
+        this.el.removeAttribute('cursor-listener');
+        this.el.sceneEl.removeEventListener('mousemove', this.dragHandler);
+      },
+      onDragStart: function (evt) {
+        this.isDragging = true;
+        this.el.emit('dragstart');
+      },
+      onDragEnd: function (evt) {
+        this.isDragging = false;
+        this.el.emit('dragend');
+      },
+      dragMove: function (evt) {
+        if (!this.isDragging) return;
+        var camera = this.camera;
+        var vector = new THREE.Vector3(evt.clientX / window.innerWidth * 2 - 1, -(evt.clientY / window.innerHeight) * 2 + 1, 0.5);
+        vector.unproject(camera);
+        var dir = vector.sub(camera.position).normalize();
+        var distance = -camera.position.y / dir.y;
+        var pos = camera.position.clone().add(dir.multiplyScalar(distance));
+        this.el.setAttribute('position', pos);
+      }
     });
     AFRAME.registerComponent('bouncing', {
       schema: {
@@ -47,7 +77,31 @@ def load_aframe_and_extras():
       }
     });
     AFRAME.registerComponent('moving-light', {
-      // ... (previous moving-light component code)
+      schema: {
+        color: {type: 'color', default: '#FFF'},
+        speed: {type: 'vec3', default: {x: 0.1, y: 0.1, z: 0.1}},
+        bounds: {type: 'vec3', default: {x: 5, y: 5, z: 5}}
+      },
+      init: function () {
+        this.dir = {x: 1, y: 1, z: 1};
+        this.light = document.createElement('a-light');
+        this.light.setAttribute('type', 'point');
+        this.light.setAttribute('color', this.data.color);
+        this.light.setAttribute('intensity', '0.75');
+        this.el.appendChild(this.light);
+      },
+      tick: function (time, timeDelta) {
+        var currentPos = this.el.getAttribute('position');
+        var speed = this.data.speed;
+        var bounds = this.data.bounds;
+        ['x', 'y', 'z'].forEach(axis => {
+          currentPos[axis] += speed[axis] * this.dir[axis] * (timeDelta / 1000);
+          if (Math.abs(currentPos[axis]) > bounds[axis]) {
+            this.dir[axis] *= -1;
+          }
+        });
+        this.el.setAttribute('position', currentPos);
+      }
     });
     function moveCamera(direction) {
       var camera = document.querySelector('[camera]');
@@ -82,7 +136,7 @@ def load_aframe_and_extras():
         if (hitObject.components.bouncing) {
           hitObject.components.bouncing.boost();
           score += 10;
-          document.getElementById('score').innerText = 'Score: ' + score;
+          document.getElementById('score').setAttribute('value', 'Score: ' + score);
         }
       }
     }
@@ -101,7 +155,55 @@ def load_aframe_and_extras():
     </script>
     """
 
-# ... (previous helper functions remain the same)
+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: #{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="#{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="#{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="#{file_stem}" width="0.5" height="0.5" class="raycastable" draggable bouncing="speed: {bounce_speed}; dist: {bounce_dist}"></a-video>'
+    return ''
+
+@st.cache_data
+def encode_file(file_path):
+    with open(file_path, "rb") as file:
+        return base64.b64encode(file.read()).decode()
+
+@st.cache_data
+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
+    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 unique_files:
+                file = random.choice(unique_files)
+                file_type = file.split('.')[-1]
+                entities += create_aframe_entity(Path(file).stem, file_type, position)
+    assets += "</a-assets>"
+    return assets, entities
 
 def main():
     st.set_page_config(layout="wide")
@@ -132,7 +234,20 @@ def main():
         st.markdown("### 📁 Directory")
         directory = st.text_input("Enter path:", ".", key="directory_input")
     
-    # ... (rest of the main function remains mostly the same)
+    if not os.path.isdir(directory):
+        st.sidebar.error("Invalid directory path")
+        return
+    file_types = ['obj', 'glb', 'webp', 'png', 'mp4']
+    if uploaded_files:
+        for uploaded_file in uploaded_files:
+            file_extension = Path(uploaded_file.name).suffix.lower()[1:]
+            if file_extension in file_types:
+                with open(os.path.join(directory, uploaded_file.name), "wb") as f:
+                    shutil.copyfileobj(uploaded_file, f)
+                st.sidebar.success(f"Uploaded: {uploaded_file.name}")
+            else:
+                st.sidebar.warning(f"Skipped unsupported file: {uploaded_file.name}")
+    files = [f for f in os.listdir(directory) if f.split('.')[-1] in file_types]
 
     aframe_scene = f"""
     <a-scene embedded style="height: 600px; width: 100%;">
@@ -148,6 +263,7 @@ def main():
 
     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)
     if camera_move:
         if camera_move == 'fire':
@@ -155,6 +271,7 @@ def main():
         else:
             aframe_scene += f"<script>moveCamera('{camera_move}');</script>"
         st.session_state.pop('camera_move')
+
     st.components.v1.html(load_aframe_and_extras() + aframe_scene, height=600)
 
 if __name__ == "__main__":