Added all boundaries

SteveBarnegren · Jun 28, 2020 · 8e28d62 · 8e28d62
1 parent b6ec5e9
commit 8e28d62
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 11 deletions.
diff --git a/PhysicsDemo/Physics System/PhysicsSimulation.swift b/PhysicsDemo/Physics System/PhysicsSimulation.swift
@@ -129,7 +129,10 @@ class PhysicsSimulation {
 
         switch boundary.orientation {
         case .minX:
-            fatalError()
+            if ball.minX < boundary.value {
+                ball.position.x = boundary.value + ball.radius
+                ball.velocity.x = abs(ball.velocity.x) * boundary.elasticity * ball.elasticity
+            }
         case .maxX:
             if ball.maxX > boundary.value {
                 ball.position.x = boundary.value - ball.radius
@@ -141,7 +144,10 @@ class PhysicsSimulation {
                 ball.velocity.y = abs(ball.velocity.y) * boundary.elasticity * ball.elasticity
             }
         case .maxY:
-            fatalError()
+            if ball.maxY > boundary.value {
+                ball.position.y = boundary.value - ball.radius
+                ball.velocity.y = -abs(ball.velocity.y) * boundary.elasticity * ball.elasticity
+            }
         }
     }
 

diff --git a/PhysicsDemo/ViewController.swift b/PhysicsDemo/ViewController.swift
@@ -47,15 +47,8 @@ class ViewController: NSViewController {
         simulation = PhysicsSimulation()
         simulation.gravity = -10
 
-        // Add bottom Boundary
-        let bottomBoundary = Boundary(orientation: .minY)
-        bottomBoundary.value = 20
-        simulation.add(boundary: bottomBoundary)
-
-        // Add right Boundary
-        let rightBoundary = Boundary(orientation: .maxX)
-        rightBoundary.value = simulationSize.width - 20
-        simulation.add(boundary: rightBoundary)
+        // Add boundaries
+        addSimulationBoundaries()
 
         // Setup input handlers
         ballPlacementHandlers = [InputHandlerPlaceBall(), InputHandlerFlingBall()]
@@ -66,6 +59,31 @@ class ViewController: NSViewController {
         pushInputHandler(baseInputHandler)
     }
 
+    func addSimulationBoundaries() {
+
+        let inset = 20.0
+
+        // Bottom
+        let bottomBoundary = Boundary(orientation: .minY)
+        bottomBoundary.value = inset
+        simulation.add(boundary: bottomBoundary)
+
+        // Right
+        let rightBoundary = Boundary(orientation: .maxX)
+        rightBoundary.value = simulationSize.width - inset
+        simulation.add(boundary: rightBoundary)
+
+        // Top
+        let topBoundary = Boundary(orientation: .maxY)
+        topBoundary.value = simulationSize.height - inset
+        simulation.add(boundary: topBoundary)
+
+        // Left
+        let leftBoundary = Boundary(orientation: .minX)
+        leftBoundary.value = inset
+        simulation.add(boundary: leftBoundary)
+    }
+
     override func viewDidAppear() {
         super.viewDidAppear()