Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from cs3217-2324/feat/collision
feat/collision
- Loading branch information
Showing
22 changed files
with
812 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
star-dash/star-dash/GameEngine/Collision/Collectible+Collidable.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| // | ||
| // Collectible+Collidable.swift | ||
| // star-dash | ||
| // | ||
| // Created by Ho Jun Hao on 16/3/24. | ||
| // | ||
|
|
||
| extension Collectible: Collidable { | ||
| func collides(with collidable: Collidable) -> Event? { | ||
| collidable.collideWithCollectible(self) | ||
| } | ||
|
|
||
| func collideWithPlayer(_ player: Player) -> Event? { | ||
| CollisionHandler.between(player: player, collectible: self) | ||
| } | ||
|
|
||
| func collideWithMonster(_ monster: Monster) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| func collideWithCollectible(_ collectible: Collectible) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| func collideWithObstacle(_ obstacle: Obstacle) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| func collideWithTool(_ tool: Tool) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| func collideWithWall(_ wall: Wall) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| func collideWithFloor(_ floor: Floor) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| func separates(from collidable: Collidable) -> Event? { | ||
| collidable.separatesFromCollectible(self) | ||
| } | ||
|
|
||
| func separatesFromPlayer(_ player: Player) -> Event? { | ||
| SeparationHandler.between(player: player, collectible: self) | ||
| } | ||
|
|
||
| func separatesFromMonster(_ monster: Monster) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| func separatesFromCollectible(_ collectible: Collectible) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| func separatesFromObstacle(_ obstacle: Obstacle) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| func separatesFromTool(_ tool: Tool) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| func separatesFromWall(_ wall: Wall) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| func separatesFromFloor(_ floor: Floor) -> Event? { | ||
| nil | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| // | ||
| // Collidable.swift | ||
| // star-dash | ||
| // | ||
| // Created by Ho Jun Hao on 16/3/24. | ||
| // | ||
|
|
||
| protocol Collidable { | ||
| func collides(with collidable: Collidable) -> Event? | ||
| func collideWithPlayer(_ player: Player) -> Event? | ||
| func collideWithMonster(_ monster: Monster) -> Event? | ||
| func collideWithCollectible(_ collectible: Collectible) -> Event? | ||
| func collideWithObstacle(_ obstacle: Obstacle) -> Event? | ||
| func collideWithTool(_ tool: Tool) -> Event? | ||
| func collideWithWall(_ wall: Wall) -> Event? | ||
| func collideWithFloor(_ floor: Floor) -> Event? | ||
|
|
||
| func separates(from collidable: Collidable) -> Event? | ||
| func separatesFromPlayer(_ player: Player) -> Event? | ||
| func separatesFromMonster(_ monster: Monster) -> Event? | ||
| func separatesFromCollectible(_ collectible: Collectible) -> Event? | ||
| func separatesFromObstacle(_ obstacle: Obstacle) -> Event? | ||
| func separatesFromTool(_ tool: Tool) -> Event? | ||
| func separatesFromWall(_ wall: Wall) -> Event? | ||
| func separatesFromFloor(_ floor: Floor) -> Event? | ||
| } |
46 changes: 46 additions & 0 deletions
46
star-dash/star-dash/GameEngine/Collision/CollisionHandler.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // | ||
| // CollisionHandler.swift | ||
| // star-dash | ||
| // | ||
| // Created by Ho Jun Hao on 16/3/24. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| struct CollisionHandler { | ||
| static func between(player: Player, monster: Monster) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| static func between(player: Player, collectible: Collectible) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| static func between(player: Player, obstacle: Obstacle) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| static func between(player: Player, floor: Floor) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| static func between(player: Player, wall: Wall) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| static func between(player: Player, tool: Tool) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| static func between(monster: Monster, tool: Tool) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| static func between(monster: Monster, wall: Wall) -> Event? { | ||
| nil | ||
| } | ||
|
|
||
| static func between(monster: Monster, floor: Floor) -> Event? { | ||
| nil | ||
| } | ||
| } |
Oops, something went wrong.