Merge pull request #174 from jgphilpott/copilot/fix-failing-tests-after-update

Fix failing tests after three-mesh-bvh upgrade to ^0.9.9

Author: jgphilpott

src/slicer/slice.test.coffee

@@ -715,58 +715,48 @@ describe 'Slicing', ->
 
     describe 'Wall Print Order with Holes', ->
 
-        test 'should print outer boundary walls before hole walls', ->
-
-            # This test uses three-bvh-csg to create a sheet with holes.
-            # Import CSG dependencies.
-            { Brush, Evaluator, SUBTRACTION } = require('three-bvh-csg')
-
-            # Suppress MeshBVH deprecation warnings from three-bvh-csg.
-            originalWarn = console.warn
-            console.warn = jest.fn()
+        SHEET_SIZE = 50
+        THICKNESS = 5
+        GRID_SIZE = 2
+        HOLE_RADIUS = 3
 
-            # Create a sheet with holes using CSG operations.
-            sheetGeometry = new THREE.BoxGeometry(50, 50, 5)
-            sheetBrush = new Brush(sheetGeometry)
-            sheetBrush.updateMatrixWorld()
-
-            csgEvaluator = new Evaluator()
+        buildSheetWithHolesMesh = ->
 
-            # Create 2x2 grid of holes.
-            gridSize = 2
-            spacing = 50 / (gridSize + 1)
-            offsetX = -50 / 2 + spacing
-            offsetY = -50 / 2 + spacing
-            holeRadius = 3
+            spacing = SHEET_SIZE / (GRID_SIZE + 1)
+            offsetX = -SHEET_SIZE / 2 + spacing
+            offsetY = -SHEET_SIZE / 2 + spacing
+            half = SHEET_SIZE / 2
 
-            resultBrush = sheetBrush
+            sheetShape = new THREE.Shape()
+            sheetShape.moveTo(-half, -half)
+            sheetShape.lineTo(half, -half)
+            sheetShape.lineTo(half, half)
+            sheetShape.lineTo(-half, half)
+            sheetShape.closePath()
 
-            for row in [0...gridSize]
+            for row in [0...GRID_SIZE]
 
-                for col in [0...gridSize]
+                for col in [0...GRID_SIZE]
 
-                    # Calculate hole position.
                     holeX = offsetX + col * spacing
                     holeY = offsetY + row * spacing
 
-                    # Create cylinder for hole.
-                    holeGeometry = new THREE.CylinderGeometry(holeRadius, holeRadius, 10, 32)
-                    holeMesh = new Brush(holeGeometry)
+                    holePath = new THREE.Path()
+                    holePath.absarc(holeX, holeY, HOLE_RADIUS, 0, Math.PI * 2, false)
+                    sheetShape.holes.push(holePath)
 
-                    holeMesh.rotation.x = Math.PI / 2
-                    holeMesh.position.set(holeX, holeY, 0)
-                    holeMesh.updateMatrixWorld()
+            sheetGeometry = new THREE.ExtrudeGeometry(sheetShape, { depth: THICKNESS, bevelEnabled: false })
 
-                    # Subtract hole from sheet.
-                    resultBrush = csgEvaluator.evaluate(resultBrush, holeMesh, SUBTRACTION)
+            mesh = new THREE.Mesh(sheetGeometry, new THREE.MeshBasicMaterial())
+            mesh.position.set(0, 0, 0)
+            mesh.updateMatrixWorld()
 
-            # Restore console.warn.
-            console.warn = originalWarn
+            return mesh
 
-            # Create final mesh.
-            finalMesh = new THREE.Mesh(resultBrush.geometry, new THREE.MeshBasicMaterial())
-            finalMesh.position.set(0, 0, 2.5)
-            finalMesh.updateMatrixWorld()
+        test 'should print outer boundary walls before hole walls', ->
+
+            # Create a sheet with holes using ExtrudeGeometry (no CSG required).
+            finalMesh = buildSheetWithHolesMesh()
 
             # Configure slicer.
             slicer.setLayerHeight(0.2)
@@ -896,56 +886,8 @@ describe 'Slicing', ->
 
         test 'should generate skin walls immediately after regular walls for holes on skin layers', ->
 
-            # This test validates the skin wall integration feature.
-            # Import CSG dependencies.
-            { Brush, Evaluator, SUBTRACTION } = require('three-bvh-csg')
-
-            # Suppress MeshBVH deprecation warnings from three-bvh-csg.
-            originalWarn = console.warn
-            console.warn = jest.fn()
-
-            # Create a sheet with holes using CSG operations.
-            sheetGeometry = new THREE.BoxGeometry(50, 50, 5)
-            sheetBrush = new Brush(sheetGeometry)
-            sheetBrush.updateMatrixWorld()
-
-            csgEvaluator = new Evaluator()
-
-            # Create 2x2 grid of holes.
-            gridSize = 2
-            spacing = 50 / (gridSize + 1)
-            offsetX = -50 / 2 + spacing
-            offsetY = -50 / 2 + spacing
-            holeRadius = 3
-
-            resultBrush = sheetBrush
-
-            for row in [0...gridSize]
-
-                for col in [0...gridSize]
-
-                    # Calculate hole position.
-                    holeX = offsetX + col * spacing
-                    holeY = offsetY + row * spacing
-
-                    # Create cylinder for hole.
-                    holeGeometry = new THREE.CylinderGeometry(holeRadius, holeRadius, 10, 32)
-                    holeMesh = new Brush(holeGeometry)
-
-                    holeMesh.rotation.x = Math.PI / 2
-                    holeMesh.position.set(holeX, holeY, 0)
-                    holeMesh.updateMatrixWorld()
-
-                    # Subtract hole from sheet.
-                    resultBrush = csgEvaluator.evaluate(resultBrush, holeMesh, SUBTRACTION)
-
-            # Restore console.warn.
-            console.warn = originalWarn
-
-            # Create final mesh.
-            finalMesh = new THREE.Mesh(resultBrush.geometry, new THREE.MeshBasicMaterial())
-            finalMesh.position.set(0, 0, 2.5)
-            finalMesh.updateMatrixWorld()
+            # Create a sheet with holes using ExtrudeGeometry (no CSG required).
+            finalMesh = buildSheetWithHolesMesh()
 
             # Configure slicer.
             slicer.setLayerHeight(0.2)

src/slicer/walls/walls.test.coffee

@@ -375,6 +375,34 @@ describe 'Wall Generation', ->
 
     describe 'Travel Path Combing', ->
 
+        SHEET_W = 50
+        DEPTH = 2
+        HOLE_RADIUS = 3
+
+        buildSheetWithHolesMesh = (holePositions) ->
+
+            half = SHEET_W / 2
+            sheetShape = new THREE.Shape()
+            sheetShape.moveTo(-half, -half)
+            sheetShape.lineTo(half, -half)
+            sheetShape.lineTo(half, half)
+            sheetShape.lineTo(-half, half)
+            sheetShape.closePath()
+
+            for pos in holePositions
+
+                holePath = new THREE.Path()
+                holePath.absarc(pos.x, pos.y, HOLE_RADIUS, 0, Math.PI * 2, false)
+                sheetShape.holes.push(holePath)
+
+            sheetGeometry = new THREE.ExtrudeGeometry(sheetShape, { depth: DEPTH, bevelEnabled: false })
+
+            mesh = new THREE.Mesh(sheetGeometry, new THREE.MeshBasicMaterial())
+            mesh.position.set(0, 0, 0)
+            mesh.updateMatrixWorld()
+
+            return mesh
+
         # Helper function to count combing paths in G-code.
         # A combing path is detected as 2+ consecutive G0 travel moves.
         countCombingPaths = (gcode) ->
@@ -402,45 +430,8 @@ describe 'Wall Generation', ->
 
         test 'should use combing paths when traveling between hole walls', ->
 
-            # Create a simple mesh with a hole using CSG-like approach.
-            # For testing, we'll create a thin box with a cylinder subtracted.
-            Brush = null
-            Evaluator = null
-            SUBTRACTION = null
-
-            try
-                { Brush, Evaluator, SUBTRACTION } = require('three-bvh-csg')
-            catch error
-                console.warn('three-bvh-csg not available, skipping combing test')
-                return
-
-            # Suppress MeshBVH deprecation warnings from three-bvh-csg.
-            originalWarn = console.warn
-            console.warn = jest.fn()
-
-            # Create a sheet (box).
-            sheetGeometry = new THREE.BoxGeometry(50, 50, 2)
-            sheetBrush = new Brush(sheetGeometry)
-            sheetBrush.updateMatrixWorld()
-
-            # Create a hole (cylinder).
-            holeGeometry = new THREE.CylinderGeometry(3, 3, 4, 32)
-            holeBrush = new Brush(holeGeometry)
-            holeBrush.rotation.x = Math.PI / 2
-            holeBrush.position.set(0, 0, 0)
-            holeBrush.updateMatrixWorld()
-
-            # Subtract hole from sheet.
-            csgEvaluator = new Evaluator()
-            resultBrush = csgEvaluator.evaluate(sheetBrush, holeBrush, SUBTRACTION)
-
-            # Restore console.warn.
-            console.warn = originalWarn
-
-            # Create final mesh.
-            mesh = new THREE.Mesh(resultBrush.geometry, new THREE.MeshBasicMaterial())
-            mesh.position.set(0, 0, 1)
-            mesh.updateMatrixWorld()
+            # Create a sheet with a single centered hole using ExtrudeGeometry (no CSG required).
+            mesh = buildSheetWithHolesMesh([{ x: 0, y: 0 }])
 
             slicer.setNozzleDiameter(0.4)
             slicer.setShellWallThickness(0.8) # 2 walls
@@ -458,52 +449,15 @@ describe 'Wall Generation', ->
 
         test 'should generate combing paths for multiple holes', ->
 
-            # Create a mesh with multiple holes.
-            Brush = null
-            Evaluator = null
-            SUBTRACTION = null
-
-            try
-                { Brush, Evaluator, SUBTRACTION } = require('three-bvh-csg')
-            catch error
-                console.warn('three-bvh-csg not available, skipping combing test')
-                return
+            # Create a sheet with 4 holes in a 2x2 grid using ExtrudeGeometry (no CSG required).
+            holePositions = [
+                { x: -12.5, y: -12.5 }
+                { x: 12.5, y: -12.5 }
+                { x: -12.5, y: 12.5 }
+                { x: 12.5, y: 12.5 }
+            ]
 
-            # Suppress MeshBVH deprecation warnings from three-bvh-csg.
-            originalWarn = console.warn
-            console.warn = jest.fn()
-
-            # Create a sheet (box).
-            sheetGeometry = new THREE.BoxGeometry(50, 50, 2)
-            sheetBrush = new Brush(sheetGeometry)
-            sheetBrush.updateMatrixWorld()
-
-            csgEvaluator = new Evaluator()
-            resultBrush = sheetBrush
-
-            # Create 4 holes in a 2x2 grid.
-            for row in [0...2]
-
-                for col in [0...2]
-
-                    x = -12.5 + col * 25
-                    y = -12.5 + row * 25
-
-                    holeGeometry = new THREE.CylinderGeometry(3, 3, 4, 32)
-                    holeBrush = new Brush(holeGeometry)
-                    holeBrush.rotation.x = Math.PI / 2
-                    holeBrush.position.set(x, y, 0)
-                    holeBrush.updateMatrixWorld()
-
-                    resultBrush = csgEvaluator.evaluate(resultBrush, holeBrush, SUBTRACTION)
-
-            # Restore console.warn.
-            console.warn = originalWarn
-
-            # Create final mesh.
-            mesh = new THREE.Mesh(resultBrush.geometry, new THREE.MeshBasicMaterial())
-            mesh.position.set(0, 0, 1)
-            mesh.updateMatrixWorld()
+            mesh = buildSheetWithHolesMesh(holePositions)
 
             slicer.setNozzleDiameter(0.4)
             slicer.setShellWallThickness(0.8) # 2 walls