Update app.py

app.py

@@ -1,5 +1,6 @@
 import streamlit as st
-import numpy as np
+from dataclasses import dataclass, field
+from typing import List
 from bokeh.plotting import figure
 from bokeh.models import ColumnDataSource
 from bokeh.events import Tap
@@ -11,15 +12,19 @@ DAMPING = 0.7
 
 # Create touch points
 num_points = 20
-x = np.linspace(50, WIDTH-50, num_points)
-y = np.linspace(50, HEIGHT-50, num_points)
-xx, yy = np.meshgrid(x, y)
-touch_points = np.column_stack((xx.ravel(), yy.ravel()))
-
+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)))]
 original_points = touch_points.copy()
-velocities = np.zeros_like(touch_points, dtype=np.bool_)
 
-source = ColumnDataSource(data=dict(x=touch_points[:, 0], y=touch_points[:, 1]))
+@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]))
 
 # Set up the Bokeh plot
 p = figure(width=WIDTH, height=HEIGHT, tools="", toolbar_location=None)
@@ -32,32 +37,39 @@ st.title("Artificial Touch Simulation")
 chart = st.bokeh_chart(p)
 
 def update_points():
-    global touch_points, velocities
+    global touch_point_objects
     
     # Apply spring force
-    force = (original_points - touch_points) * ELASTICITY
-    
-    # Update velocity
-    velocities += 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
     
     # Apply damping
-    velocities *= DAMPING
+    for tp in touch_point_objects:
+        tp.velocity_x *= DAMPING
+        tp.velocity_y *= DAMPING
     
     # Update position
-    touch_points += velocities
+    for tp in touch_point_objects:
+        tp.x += tp.velocity_x
+        tp.y += tp.velocity_y
     
     # Update Bokeh data source
-    source.data = dict(x=touch_points[:, 0], y=touch_points[:, 1])
+    source.data = dict(x=[tp.x for tp in touch_point_objects], y=[tp.y for tp in touch_point_objects])
 
 def on_tap(event):
-    global touch_points, velocities
+    global touch_point_objects
     
     x, y = event.x, event.y
-    distances = np.sqrt(np.sum((touch_points - [x, y])**2, axis=1))
-    affected = distances < 30
-    
-    force = (touch_points[affected] - [x, y]) / distances[affected, np.newaxis]
-    velocities[affected] -= force * 10
+    for tp in touch_point_objects:
+        distance = ((tp.x - x)**2 + (tp.y - 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
     
     st.write(f"Touch at ({x:.2f}, {y:.2f})")
     update_points()