diff --git a/index.html b/index.html index 53e8610..7c31af9 100644 --- a/index.html +++ b/index.html @@ -10,19 +10,5 @@ class="h-full w-full bg-neutral-100 font-poppins dark:bg-neutral-950 dark:text-white" > - diff --git a/public/sw.js b/public/sw.js index ada59d6..1c3df1d 100644 --- a/public/sw.js +++ b/public/sw.js @@ -47,6 +47,17 @@ self.addEventListener("activate", (event) => { // On fetch, intercept server requests // and respond with cached responses instead of going to network self.addEventListener("fetch", (event) => { + // Skip service worker for Vite dev server requests + if (event.request.url.includes('/@vite/') || + event.request.url.includes('/@fs/') || + event.request.url.includes('/__vite_ping') || + event.request.url.includes('/node_modules/') || + event.request.url.includes('?import') || + event.request.url.includes('.ts') && !event.request.url.includes('/assets/')) { + event.respondWith(fetch(event.request)); + return; + } + // As a single page app, direct app to always go to cached home page. if (event.request.mode === "navigate") { event.respondWith(caches.match("/")); @@ -59,12 +70,12 @@ self.addEventListener("fetch", (event) => { fetch(event.request).catch(() => { // If network fails, return a custom offline response return new Response( - JSON.stringify({ - error: 'offline', - message: 'You are offline. Please check your internet connection and try again.' - }), - { - status: 503, + JSON.stringify({ + error: 'offline', + message: 'You are offline. Please check your internet connection and try again.' + }), + { + status: 503, statusText: 'Service Unavailable', headers: { 'Content-Type': 'application/json' } } @@ -83,8 +94,14 @@ self.addEventListener("fetch", (event) => { // Return the cached response if it's available. return cachedResponse; } - // If resource isn't in the cache, return a 404. - return new Response(null, { status: 404 }); + // Try network as fallback + try { + const networkResponse = await fetch(event.request); + return networkResponse; + } catch (error) { + // If resource isn't in cache and network fails, return a 404 + return new Response(null, { status: 404 }); + } })(), ); }); diff --git a/src/App.svelte b/src/App.svelte index ba10df4..7206793 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -16,6 +16,11 @@ radiansToDegrees, shortestRotation, } from "./utils"; + import { + findPathAroundObstacles, + smoothPath, + isPathClear, + } from "./utils/pathOptimization"; import hotkeys from 'hotkeys-js'; let two: Two; @@ -602,6 +607,113 @@ return result; } + /** + * Optimize all paths to avoid obstacles using A* pathfinding + * Finds the shortest collision-free path around all obstacles + */ + export async function optimizePathsAvoidingObstacles(): Promise { + if (shapes.length === 0) { + alert('āš ļø No obstacles defined. Add obstacles first to use this feature.'); + return; + } + + // Calculate robot clearance radius using diagonal (worst case rotation) + // This ensures the entire robot body stays clear of obstacles at any angle + const robotDiagonal = Math.sqrt(robotWidth * robotWidth + robotHeight * robotHeight); + const safetyMargin = 6; // Generous 6 inch safety margin + const robotRadius = robotDiagonal / 2 + safetyMargin; + + let totalPathsOptimized = 0; + let pathsWithCollisions = 0; + + console.log('šŸ” Starting obstacle avoidance optimization...'); + console.log(`Robot dimensions: ${robotWidth}" Ɨ ${robotHeight}"`); + console.log(`Robot diagonal: ${robotDiagonal.toFixed(1)}" (clearance radius: ${robotRadius.toFixed(1)}")`); + console.log(`Obstacles to avoid: ${shapes.length}`); + + for (let lineIdx = 0; lineIdx < lines.length; lineIdx++) { + const line = lines[lineIdx]; + const _startPoint = lineIdx === 0 ? startPoint : lines[lineIdx - 1].endPoint; + + console.log(`\nšŸ“ Optimizing Path ${lineIdx + 1}: (${_startPoint.x.toFixed(1)}, ${_startPoint.y.toFixed(1)}) ā†’ (${line.endPoint.x.toFixed(1)}, ${line.endPoint.y.toFixed(1)})`); + + // Check if current path has collisions + const currentPath = [_startPoint, ...line.controlPoints, line.endPoint]; + let hasCollision = false; + + for (let i = 0; i < currentPath.length - 1; i++) { + if (!isPathClear(currentPath[i], currentPath[i + 1], shapes, robotRadius)) { + hasCollision = true; + pathsWithCollisions++; + console.log('āš ļø Collision detected!'); + break; + } + } + + if (!hasCollision && line.controlPoints.length === 0) { + console.log('āœ… Path is already clear - no optimization needed'); + continue; + } + + // Use A* to find optimal path around obstacles + const optimalPath = findPathAroundObstacles( + _startPoint, + line.endPoint, + shapes, + robotRadius, + 0, + 144 + ); + + console.log(`šŸ›¤ļø A* found path with ${optimalPath.length} waypoints`); + + // Smooth the path to reduce unnecessary waypoints + const smoothedPath = smoothPath(optimalPath, shapes, robotRadius); + + console.log(`āœØ Smoothed to ${smoothedPath.length} waypoints`); + + // Validate the smoothed path is actually collision-free + let smoothedPathClear = true; + for (let i = 0; i < smoothedPath.length - 1; i++) { + if (!isPathClear(smoothedPath[i], smoothedPath[i + 1], shapes, robotRadius)) { + console.warn(`āš ļø Smoothed path still has collision between waypoints ${i} and ${i+1}`); + smoothedPathClear = false; + break; + } + } + + // If smoothed path has collisions, use the unsmoothed optimal path + const finalPath = smoothedPathClear ? smoothedPath : optimalPath; + + if (!smoothedPathClear) { + console.log(`šŸ”„ Using unsmoothed path (${finalPath.length} waypoints) due to collision`); + } + + // Update line with new control points (exclude start and end) + const newControlPoints = finalPath.slice(1, -1).map(p => ({ x: p.x, y: p.y })); + + // Only update if path changed significantly or had collision + if (hasCollision || newControlPoints.length !== line.controlPoints.length) { + line.controlPoints = newControlPoints; + totalPathsOptimized++; + console.log(`āœ… Path optimized with ${newControlPoints.length} control points!`); + } else { + console.log('ā„¹ļø Path unchanged'); + } + } + + // Trigger reactivity + lines = lines; + + console.log(`\nšŸŽ‰ Optimization complete! ${totalPathsOptimized}/${lines.length} paths updated`); + + if (pathsWithCollisions > 0) { + alert(`āœ… Obstacle avoidance complete!\n\nšŸ“Š Results:\nā€¢ ${pathsWithCollisions} path(s) had collisions\nā€¢ ${totalPathsOptimized} path(s) were optimized\nā€¢ All paths now avoid obstacles!\n\nšŸ¤– Robot clearance: ${robotRadius.toFixed(1)}" radius\n(${robotWidth}" Ɨ ${robotHeight}" with ${robotDiagonal.toFixed(1)}" diagonal + ${safetyMargin}" margin)\n\nThe robot body will NOT touch any obstacles.`); + } else { + alert(`āœ… All paths are already clear!\n\nNo collisions were detected with ${robotRadius.toFixed(1)}" clearance radius.\nYour paths already avoid all obstacles with proper robot body clearance.`); + } + } + onMount(() => { two = new Two({ fitted: true, @@ -845,5 +957,6 @@ hotkeys('s', function(event, handler){ {x} {y} {fpa} + {optimizePathsAvoidingObstacles} /> diff --git a/src/lib/ControlTab.svelte b/src/lib/ControlTab.svelte index 37407c4..7cc97a8 100644 --- a/src/lib/ControlTab.svelte +++ b/src/lib/ControlTab.svelte @@ -17,6 +17,7 @@ export let y: d3.ScaleLinear; export let settings: FPASettings; export let shapes: Shape[]; + export let optimizePathsAvoidingObstacles: () => Promise; function createTriangle(): Shape { return { @@ -106,8 +107,29 @@
-
Obstacles
- +
+
Obstacles
+ {#if shapes.length > 0} + + {/if} +
+ {#each shapes as shape, shapeIdx}
diff --git a/src/main.ts b/src/main.ts index 5959ea9..82dd2aa 100644 --- a/src/main.ts +++ b/src/main.ts @@ -5,4 +5,27 @@ const app = new App({ target: document.body!, }); +// Service worker registration +if ("serviceWorker" in navigator) { + if (import.meta.env.PROD) { + // Only register service worker in production + navigator.serviceWorker.register("/sw.js").then( + (registration) => { + console.log("Service worker registration successful:", registration); + }, + (error) => { + console.error(`Service worker registration failed: ${error}`); + }, + ); + } else { + // In development, unregister any existing service workers + navigator.serviceWorker.getRegistrations().then((registrations) => { + for (let registration of registrations) { + registration.unregister(); + console.log("Unregistered service worker for development mode"); + } + }); + } +} + export default app; diff --git a/src/utils/pathOptimization.ts b/src/utils/pathOptimization.ts new file mode 100644 index 0000000..0f5d913 --- /dev/null +++ b/src/utils/pathOptimization.ts @@ -0,0 +1,316 @@ +/** + * SIMPLIFIED Path optimization for obstacle avoidance + * Focus on correctness over complexity + */ + +/** + * Check if a point is inside a polygon using ray casting + */ +export function isPointInPolygon(point: BasePoint, polygon: BasePoint[]): boolean { + let inside = false; + for (let i = 0, j = polygon.length - 1; i < polygon.length; j = i++) { + const xi = polygon[i].x, yi = polygon[i].y; + const xj = polygon[j].x, yj = polygon[j].y; + + const intersect = ((yi > point.y) !== (yj > point.y)) + && (point.x < (xj - xi) * (point.y - yi) / (yj - yi) + xi); + if (intersect) inside = !inside; + } + return inside; +} + +/** + * Calculate distance from point to line segment + */ +function distanceToSegment(p: BasePoint, a: BasePoint, b: BasePoint): number { + const dx = b.x - a.x; + const dy = b.y - a.y; + const lengthSq = dx * dx + dy * dy; + + if (lengthSq === 0) { + return Math.sqrt((p.x - a.x) ** 2 + (p.y - a.y) ** 2); + } + + let t = ((p.x - a.x) * dx + (p.y - a.y) * dy) / lengthSq; + t = Math.max(0, Math.min(1, t)); + + const closestX = a.x + t * dx; + const closestY = a.y + t * dy; + + return Math.sqrt((p.x - closestX) ** 2 + (p.y - closestY) ** 2); +} + +/** + * SIMPLE polygon expansion - just push each vertex outward from center + */ +export function expandPolygon(polygon: BasePoint[], margin: number): BasePoint[] { + if (polygon.length < 3 || margin <= 0) return [...polygon]; + + // Calculate center + let centerX = 0, centerY = 0; + for (const p of polygon) { + centerX += p.x; + centerY += p.y; + } + centerX /= polygon.length; + centerY /= polygon.length; + + // Push each vertex away from center + const expanded: BasePoint[] = []; + for (const vertex of polygon) { + const dx = vertex.x - centerX; + const dy = vertex.y - centerY; + const dist = Math.sqrt(dx * dx + dy * dy); + + if (dist > 0.001) { + const scale = (dist + margin) / dist; + expanded.push({ + x: centerX + dx * scale, + y: centerY + dy * scale + }); + } else { + expanded.push({ x: vertex.x + margin, y: vertex.y + margin }); + } + } + + return expanded; +} + +/** + * Check if path segment is too close to obstacle + */ +function isSegmentTooCloseToObstacle( + start: BasePoint, + end: BasePoint, + obstacle: BasePoint[], + minDistance: number +): boolean { + // Sample many points along the segment + const samples = 50; + for (let i = 0; i <= samples; i++) { + const t = i / samples; + const point = { + x: start.x + t * (end.x - start.x), + y: start.y + t * (end.y - start.y) + }; + + // Check if point is inside obstacle + if (isPointInPolygon(point, obstacle)) { + return true; + } + + // Check if point is too close to any obstacle edge + for (let j = 0; j < obstacle.length; j++) { + const k = (j + 1) % obstacle.length; + const dist = distanceToSegment(point, obstacle[j], obstacle[k]); + if (dist < minDistance) { + return true; + } + } + } + + return false; +} + +/** + * Check if path is clear of all obstacles + */ +export function isPathClear( + start: BasePoint, + end: BasePoint, + obstacles: Shape[], + robotRadius: number +): boolean { + for (const obstacle of obstacles) { + if (obstacle.vertices.length < 3) continue; + + // Check if path is too close to this obstacle + if (isSegmentTooCloseToObstacle(start, end, obstacle.vertices, robotRadius)) { + return false; + } + } + return true; +} + +/** + * Generate waypoints around obstacles + */ +export function findVisibilityWaypoints( + start: BasePoint, + end: BasePoint, + obstacles: Shape[], + robotRadius: number, + fieldMin: number, + fieldMax: number +): BasePoint[] { + const waypoints: BasePoint[] = [start]; + + // Add waypoints at different distances from obstacles + for (const obstacle of obstacles) { + if (obstacle.vertices.length < 3) continue; + + // Create waypoints at multiple clearance levels + for (const clearance of [1.5, 2.0, 2.5]) { + const expanded = expandPolygon(obstacle.vertices, robotRadius * clearance); + + for (const vertex of expanded) { + if (vertex.x >= fieldMin && vertex.x <= fieldMax && + vertex.y >= fieldMin && vertex.y <= fieldMax) { + waypoints.push(vertex); + } + } + } + } + + waypoints.push(end); + return waypoints; +} + +/** + * Calculate distance between two points + */ +function distance(a: BasePoint, b: BasePoint): number { + return Math.sqrt((a.x - b.x) ** 2 + (a.y - b.y) ** 2); +} + +/** + * A* pathfinding algorithm + */ +export function findPathAroundObstacles( + start: BasePoint, + end: BasePoint, + obstacles: Shape[], + robotRadius: number, + fieldMin: number = 0, + fieldMax: number = 144 +): BasePoint[] { + console.log(`\nšŸ” Finding path: (${start.x.toFixed(1)}, ${start.y.toFixed(1)}) ā†’ (${end.x.toFixed(1)}, ${end.y.toFixed(1)})`); + console.log(`Robot radius: ${robotRadius.toFixed(1)}"`); + + // Check if direct path works + if (isPathClear(start, end, obstacles, robotRadius)) { + console.log('āœ… Direct path is clear!'); + return [start, end]; + } + + console.log('āŒ Direct path blocked, running A*...'); + + // Get waypoints + const waypoints = findVisibilityWaypoints(start, end, obstacles, robotRadius, fieldMin, fieldMax); + console.log(`Found ${waypoints.length} waypoints`); + + // Build visibility graph + const graph = new Map(); + for (let i = 0; i < waypoints.length; i++) { + graph.set(i, []); + } + + for (let i = 0; i < waypoints.length; i++) { + for (let j = i + 1; j < waypoints.length; j++) { + if (isPathClear(waypoints[i], waypoints[j], obstacles, robotRadius)) { + graph.get(i)!.push(j); + graph.get(j)!.push(i); + } + } + } + + // A* search + const startIdx = 0; + const endIdx = waypoints.length - 1; + + const openSet = new Set([startIdx]); + const closedSet = new Set(); + const cameFrom = new Map(); + const gScore = new Map(); + const fScore = new Map(); + + for (let i = 0; i < waypoints.length; i++) { + gScore.set(i, Infinity); + fScore.set(i, Infinity); + } + + gScore.set(startIdx, 0); + fScore.set(startIdx, distance(waypoints[startIdx], waypoints[endIdx])); + + let iterations = 0; + + while (openSet.size > 0 && iterations < 1000) { + iterations++; + + // Find node with lowest fScore + let current = -1; + let lowestF = Infinity; + for (const node of openSet) { + const f = fScore.get(node)!; + if (f < lowestF) { + lowestF = f; + current = node; + } + } + + if (current === endIdx) { + // Reconstruct path + const path: BasePoint[] = []; + let curr = current; + while (curr !== undefined) { + path.unshift(waypoints[curr]); + curr = cameFrom.get(curr)!; + } + console.log(`āœ… A* succeeded in ${iterations} iterations, path length: ${path.length}`); + return path; + } + + openSet.delete(current); + closedSet.add(current); + + for (const neighbor of graph.get(current)!) { + if (closedSet.has(neighbor)) continue; + + const tentativeG = gScore.get(current)! + distance(waypoints[current], waypoints[neighbor]); + + if (!openSet.has(neighbor)) { + openSet.add(neighbor); + } else if (tentativeG >= gScore.get(neighbor)!) { + continue; + } + + cameFrom.set(neighbor, current); + gScore.set(neighbor, tentativeG); + fScore.set(neighbor, tentativeG + distance(waypoints[neighbor], waypoints[endIdx])); + } + } + + console.error(`āŒ A* failed after ${iterations} iterations`); + return [start, end]; +} + +/** + * Smooth path by removing unnecessary waypoints + */ +export function smoothPath( + path: BasePoint[], + obstacles: Shape[], + robotRadius: number +): BasePoint[] { + if (path.length <= 2) return path; + + const smoothed: BasePoint[] = [path[0]]; + let current = 0; + + while (current < path.length - 1) { + let farthest = current + 1; + + // Try to skip ahead as far as possible + for (let i = path.length - 1; i > current + 1; i--) { + if (isPathClear(path[current], path[i], obstacles, robotRadius)) { + farthest = i; + break; + } + } + + smoothed.push(path[farthest]); + current = farthest; + } + + return smoothed; +} \ No newline at end of file