Update app.py

app.py

@@ -9,31 +9,105 @@ def load_aframe_and_extras():
     <script src="https://unpkg.com/[email protected]/dist/aframe-event-set-component.min.js"></script>
     <script>
     let score = 0;
+    let selectedEntity = null;
+
+    AFRAME.registerComponent('draggable', {
+      init: function () {
+        this.el.addEventListener('mousedown', this.onMouseDown.bind(this));
+        this.el.addEventListener('touchstart', this.onTouchStart.bind(this));
+        this.el.addEventListener('mouseup', this.onMouseUp.bind(this));
+        this.el.addEventListener('touchend', this.onTouchEnd.bind(this));
+        this.el.addEventListener('mousemove', this.onMouseMove.bind(this));
+        this.el.addEventListener('touchmove', this.onTouchMove.bind(this));
+      },
+      onMouseDown: function (evt) {
+        selectedEntity = this.el;
+      },
+      onTouchStart: function (evt) {
+        evt.preventDefault();
+        selectedEntity = this.el;
+      },
+      onMouseUp: function () {
+        selectedEntity = null;
+      },
+      onTouchEnd: function () {
+        selectedEntity = null;
+      },
+      onMouseMove: function (evt) {
+        if (selectedEntity) {
+          let cam = document.querySelector('[camera]');
+          let dir = new THREE.Vector3();
+          cam.object3D.getWorldDirection(dir);
+          let rc = new THREE.Raycaster(cam.object3D.position, dir);
+          let plane = new THREE.Plane(new THREE.Vector3(0, 1, 0), 0);
+          let pos = new THREE.Vector3();
+          rc.ray.intersectPlane(plane, pos);
+          selectedEntity.setAttribute('position', {x: pos.x, y: 0, z: pos.z});
+        }
+      },
+      onTouchMove: function (evt) {
+        evt.preventDefault();
+        if (selectedEntity) {
+          let cam = document.querySelector('[camera]');
+          let dir = new THREE.Vector3();
+          cam.object3D.getWorldDirection(dir);
+          let rc = new THREE.Raycaster(cam.object3D.position, dir);
+          let plane = new THREE.Plane(new THREE.Vector3(0, 1, 0), 0);
+          let pos = new THREE.Vector3();
+          rc.ray.intersectPlane(plane, pos);
+          selectedEntity.setAttribute('position', {x: pos.x, y: 0, z: pos.z});
+        }
+      }
+    });
 
-    /* Draggable, bouncing, moving-light components unchanged */
-    AFRAME.registerComponent('draggable', {/* … */});
     AFRAME.registerComponent('bouncing', {/* … */});
     AFRAME.registerComponent('moving-light', {/* … */});
 
-    function moveCamera(direction) {
+    function moveCamera(view) {
       var rig = document.querySelector('#rig');
-      var pos = rig.getAttribute('position');
-      var rot = rig.getAttribute('rotation');
-      var speed = 0.5, rSpeed = 5;
-      switch(direction) {
-        case 'forward':  pos.z -= speed; break;
-        case 'backward': pos.z += speed; break;
-        case 'left':     pos.x -= speed; break;
-        case 'right':    pos.x += speed; break;
-        case 'up':       pos.y += speed; break;
-        case 'down':     pos.y -= speed; break;
-        case 'reset':    pos = {x:0,y:1.6,z:0}; rot = {x:0,y:0,z:0}; break;
-        case 'rotateY+': rot.y += rSpeed; break;
-        case 'rotateY-': rot.y -= rSpeed; break;
-        case 'rotateZ+': rot.z += rSpeed; break;
-        case 'rotateZ-': rot.z -= rSpeed; break;
-        case 'zoomIn':   rig.object3D.scale.multiplyScalar(0.9); break;
-        case 'zoomOut':  rig.object3D.scale.multiplyScalar(1.1); break;
+      var gw = 8, gh = 8;
+      var centerX = 0, centerZ = 0;
+      var height = Math.max(gw, gh) * 1.5;
+      var distance = Math.max(gw, gh) * 1.2;
+      var pos, rot;
+
+      switch(view) {
+        case 'top':
+          pos = {x: centerX, y: height, z: centerZ};
+          rot = {x: -90, y: 0, z: 0};
+          break;
+        case 'left':
+          pos = {x: -distance, y: height / 2, z: centerZ};
+          rot = {x: 0, y: 90, z: 0};
+          break;
+        case 'right':
+          pos = {x: distance, y: height / 2, z: centerZ};
+          rot = {x: 0, y: -90, z: 0};
+          break;
+        case 'front':
+          pos = {x: centerX, y: height / 2, z: -distance};
+          rot = {x: 0, y: 0, z: 0};
+          break;
+        case 'back':
+          pos = {x: centerX, y: height / 2, z: distance};
+          rot = {x: 0, y: 180, z: 0};
+          break;
+        case 'angle1':
+          pos = {x: -distance * 0.7, y: height, z: -distance * 0.7};
+          rot = {x: -45, y: 45, z: 0};
+          break;
+        case 'angle2':
+          pos = {x: distance * 0.7, y: height, z: -distance * 0.7};
+          rot = {x: -45, y: -45, z: 0};
+          break;
+        case 'angle3':
+          pos = {x: -distance * 0.7, y: height, z: distance * 0.7};
+          rot = {x: -45, y: 135, z: 0};
+          break;
+        case 'angle4':
+          pos = {x: distance * 0.7, y: height, z: distance * 0.7};
+          rot = {x: -45, y: -135, z: 0};
+          break;
       }
       rig.setAttribute('position', pos);
       rig.setAttribute('rotation', rot);
@@ -58,18 +132,16 @@ def load_aframe_and_extras():
 
     document.addEventListener('keydown', e => {
       switch(e.key.toLowerCase()){
-        case 'arrowup':    moveCamera('forward');  break;
-        case 'arrowdown':  moveCamera('backward'); break;
-        case 'arrowleft':  moveCamera('left');     break;
-        case 'arrowright': moveCamera('right');    break;
-        case 'r':          moveCamera('reset');    break;
-        case 'q':          moveCamera('rotateY+'); break;
-        case 'e':          moveCamera('rotateY-'); break;
-        case 'z':          moveCamera('rotateZ+'); break;
-        case 'c':          moveCamera('rotateZ-'); break;
-        case 'pageup':     moveCamera('zoomIn');   break;
-        case 'pagedown':   moveCamera('zoomOut');  break;
-        case ' ':          fireRaycast();          break;
+        case '1': moveCamera('top');    break;
+        case '2': moveCamera('left');   break;
+        case '3': moveCamera('right');  break;
+        case '4': moveCamera('front');  break;
+        case '5': moveCamera('back');   break;
+        case '6': moveCamera('angle1'); break;
+        case '7': moveCamera('angle2'); break;
+        case '8': moveCamera('angle3'); break;
+        case '9': moveCamera('angle4'); break;
+        case ' ': fireRaycast();        break;
       }
     });
     </script>
@@ -93,7 +165,7 @@ def create_aframe_entity(stem, ext, pos):
 
 @st.cache_data
 def generate_tilemap(files, dirpath, gw=8, gh=8):
-    img_exts   = ['webp','png']
+    img_exts   = ['webp','png','jpeg','jpg']
     model_exts = ['obj','glb','gltf']
     vid_exts   = ['mp4']
 
@@ -124,49 +196,37 @@ def generate_tilemap(files, dirpath, gw=8, gh=8):
         if imgs:
           img=random.choice(imgs); s=Path(img).stem
           entities += (f'<a-plane src="#{s}" width="1" height="1" '
-                       f'rotation="-90 0 0" position="{x} 0.01 {z}"></a-plane>')
+                       f'rotation="-90 0 0" position="{x} 0 {z}"></a-plane>')
         if models:
           m=random.choice(models); ext=m.split('.')[-1]; s=Path(m).stem
-          entities += create_aframe_entity(s,ext,f"{x} 0.5 {z}")
+          entities += create_aframe_entity(s,ext,f"{x} 0 {z}")
         if vids:
           v=random.choice(vids); s=Path(v).stem
           entities += (f'<a-video src="#{s}" width="1" height="1" '
-                       f'rotation="-90 0 0" position="{x} 0.2 {z}" '
+                       f'rotation="-90 0 0" position="{x} 0.1 {z}" '
                        'class="raycastable" draggable></a-video>')
     return assets, entities
 
 def main():
     st.set_page_config(layout="wide")
     with st.sidebar:
-        st.markdown("### 🧭 Navigation Controls")
-        # Pan the View
-        st.markdown("**Pan the View** ⬅️➡️")
-        cols = st.columns(4)
-        cols[0].button("⬅️", on_click=lambda: st.session_state.update({'camera_move': 'left'}))
-        cols[1].button("➡️", on_click=lambda: st.session_state.update({'camera_move': 'right'}))
-        cols[2].button("⬆️", on_click=lambda: st.session_state.update({'camera_move': 'forward'}))
-        cols[3].button("⬇️", on_click=lambda: st.session_state.update({'camera_move': 'backward'}))
-        
-        # Rotate the 3D Scene
-        st.markdown("**Rotate the 3D Scene** 🔄")
-        cols = st.columns(4)
-        cols[0].button("⬅️ Rotate Y+", on_click=lambda: st.session_state.update({'camera_move': 'rotateY+'}))
-        cols[1].button("➡️ Rotate Y-", on_click=lambda: st.session_state.update({'camera_move': 'rotateY-'}))
-        cols[2].button("↖️ Rotate Z+", on_click=lambda: st.session_state.update({'camera_move': 'rotateZ+'}))
-        cols[3].button("↘️ Rotate Z-", on_click=lambda: st.session_state.update({'camera_move': 'rotateZ-'}))
-        
-        # Zoom Controls
-        st.markdown("**Zoom** 🔎")
-        cols = st.columns(2)
-        cols[0].button("➕ Zoom In", on_click=lambda: st.session_state.update({'camera_move': 'zoomIn'}))
-        cols[1].button("➖ Zoom Out", on_click=lambda: st.session_state.update({'camera_move': 'zoomOut'}))
-        
-        # Reset View
-        st.markdown("**Reset View** 🔄")
-        st.button("🔄 Reset", on_click=lambda: st.session_state.update({'camera_move': 'reset'}))
+        st.markdown("### 🧭 Camera Views")
+        st.markdown("**Select View** 📷")
+        cols = st.columns(3)
+        cols[0].button("🔝 Top", on_click=lambda: st.session_state.update({'camera_view': 'top'}))
+        cols[1].button("⬅️ Left", on_click=lambda: st.session_state.update({'camera_view': 'left'}))
+        cols[2].button("➡️ Right", on_click=lambda: st.session_state.update({'camera_view': 'right'}))
+        cols = st.columns(3)
+        cols[0].button("⬆️ Front", on_click=lambda: st.session_state.update({'camera_view': 'front'}))
+        cols[1].button("⬇️ Back", on_click=lambda: st.session_state.update({'camera_view': 'back'}))
+        cols[2].button("↖️ Angle 1", on_click=lambda: st.session_state.update({'camera_view': 'angle1'}))
+        cols = st.columns(3)
+        cols[0].button("↗️ Angle 2", on_click=lambda: st.session_state.update({'camera_view': 'angle2'}))
+        cols[1].button("↙️ Angle 3", on_click=lambda: st.session_state.update({'camera_view': 'angle3'}))
+        cols[2].button("↘️ Angle 4", on_click=lambda: st.session_state.update({'camera_view': 'angle4'}))
 
         st.markdown("### ➕ Add Media Files")
-        ups = st.file_uploader("Add files (png, obj, glb, etc.):", accept_multiple_files=True)
+        ups = st.file_uploader("Add files (png, jpeg, obj, glb, mp4, etc.):", accept_multiple_files=True)
         st.markdown("### 📋 Uploaded Model Files")
         directory = st.text_input("Path:", ".", key="dir")
         if os.path.isdir(directory):
@@ -181,7 +241,7 @@ def main():
         st.sidebar.error("Invalid directory")
         return
 
-    types = ['obj','glb','gltf','webp','png','mp4']
+    types = ['obj','glb','gltf','webp','png','jpeg','jpg','mp4']
     if ups:
       for up in ups:
         ext=Path(up.name).suffix.lower()[1:]
@@ -197,9 +257,9 @@ def main():
     spot_h = max(8,8)*1.5
 
     scene = f"""
-    <a-scene embedded style="height:600px; width:100%;">
-      <a-entity id="rig" position="0 1.6 0" rotation="0 0 0">
-        <a-camera fov="60" look-controls wasd-controls="enabled:true"
+    <a-scene embedded style="height:100vh; width:100vw; position:fixed; top:0; left:0;">
+      <a-entity id="rig" position="0 12 0" rotation="-90 0 0">
+        <a-camera fov="60" look-controls wasd-controls="enabled:false"
                   cursor="rayOrigin:mouse" raycaster="objects:.raycastable">
         </a-camera>
       </a-entity>
@@ -215,16 +275,16 @@ def main():
     assets, ents = generate_tilemap(files, directory, 8, 8)
     scene += assets + ents + "</a-scene>"
 
-    cmd = st.session_state.get('camera_move')
+    cmd = st.session_state.get('camera_view', 'top')
     if cmd:
       scene += f"<script>moveCamera('{cmd}');</script>"
-      st.session_state.pop('camera_move')
+      st.session_state.pop('camera_view', None)
 
     loader = '<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/aframe-extras.loaders.min.js"></script>'
 
     st.components.v1.html(
       load_aframe_and_extras() + loader + scene,
-      height=650
+      height=1000
     )
 
 if __name__ == "__main__":