Update app.py

app.py

@@ -1,6 +1,5 @@
 import streamlit as st
-from dataclasses import dataclass, field
-from typing import List
+from typing import List, Tuple
 from bokeh.plotting import figure
 from bokeh.models import ColumnDataSource
 from bokeh.events import Tap
@@ -12,19 +11,11 @@ DAMPING = 0.7
 
 # Create touch points
 num_points = 20
-touch_points = [(x, y) for x in range(50, WIDTH-50, int((WIDTH-100)/(num_points-1))) for y in range(50, HEIGHT-50, int((HEIGHT-100)/(num_points-1)))]
+touch_points: List[Tuple[float, float]] = [(x, y) for x in range(50, WIDTH-50, int((WIDTH-100)/(num_points-1))) for y in range(50, HEIGHT-50, int((HEIGHT-100)/(num_points-1)))]
 original_points = touch_points.copy()
+velocities: List[Tuple[float, float]] = [(0.0, 0.0)] * len(touch_points)
 
-@dataclass
-class TouchPoint:
-    x: float
-    y: float
-    velocity_x: float = 0.0
-    velocity_y: float = 0.0
-
-touch_point_objects: List[TouchPoint] = [TouchPoint(x, y) for x, y in touch_points]
-
-source = ColumnDataSource(data=dict(x=[tp.x for tp in touch_point_objects], y=[tp.y for tp in touch_point_objects]))
+source = ColumnDataSource(data=dict(x=[x for x, y in touch_points], y=[y for x, y in touch_points]))
 
 # Set up the Bokeh plot
 p = figure(width=WIDTH, height=HEIGHT, tools="", toolbar_location=None)
@@ -37,39 +28,36 @@ st.title("Artificial Touch Simulation")
 chart = st.bokeh_chart(p)
 
 def update_points():
-    global touch_point_objects
+    global touch_points, velocities
     
     # Apply spring force
-    for tp in touch_point_objects:
-        force_x = (original_points[touch_point_objects.index(tp)][0] - tp.x) * ELASTICITY
-        force_y = (original_points[touch_point_objects.index(tp)][1] - tp.y) * ELASTICITY
-        tp.velocity_x += force_x
-        tp.velocity_y += force_y
+    for i, (x, y) in enumerate(touch_points):
+        force_x = (original_points[i][0] - x) * ELASTICITY
+        force_y = (original_points[i][1] - y) * ELASTICITY
+        velocities[i] = (velocities[i][0] + force_x, velocities[i][1] + force_y)
     
     # Apply damping
-    for tp in touch_point_objects:
-        tp.velocity_x *= DAMPING
-        tp.velocity_y *= DAMPING
+    for i, (vx, vy) in enumerate(velocities):
+        velocities[i] = (vx * DAMPING, vy * DAMPING)
     
     # Update position
-    for tp in touch_point_objects:
-        tp.x += tp.velocity_x
-        tp.y += tp.velocity_y
+    for i, (x, y) in enumerate(touch_points):
+        vx, vy = velocities[i]
+        touch_points[i] = (x + vx, y + vy)
     
     # Update Bokeh data source
-    source.data = dict(x=[tp.x for tp in touch_point_objects], y=[tp.y for tp in touch_point_objects])
+    source.data = dict(x=[x for x, y in touch_points], y=[y for x, y in touch_points])
 
 def on_tap(event):
-    global touch_point_objects
+    global touch_points, velocities
     
     x, y = event.x, event.y
-    for tp in touch_point_objects:
-        distance = ((tp.x - x)**2 + (tp.y - y)**2)**0.5
+    for i, (tx, ty) in enumerate(touch_points):
+        distance = ((tx - x)**2 + (ty - y)**2)**0.5
         if distance < 30:
-            force_x = (tp.x - x) / distance
-            force_y = (tp.y - y) / distance
-            tp.velocity_x -= force_x * 10
-            tp.velocity_y -= force_y * 10
+            force_x = (tx - x) / distance
+            force_y = (ty - y) / distance
+            velocities[i] = (velocities[i][0] - force_x * 10, velocities[i][1] - force_y * 10)
     
     st.write(f"Touch at ({x:.2f}, {y:.2f})")
     update_points()