style: lint

cs3217-2324 · Mar 13, 2024 · adf2d7d · adf2d7d
1 parent 5788fdd
commit adf2d7d
Show file tree

Hide file tree

Showing 19 changed files with 100 additions and 97 deletions.
diff --git a/star-dash/star-dash/AppDelegate.swift b/star-dash/star-dash/AppDelegate.swift
@@ -10,27 +10,26 @@ import UIKit
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
-
-
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication,
+                     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
-        return true
+        true
     }
 
     // MARK: UISceneSession Lifecycle
 
-    func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
+    func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession,
+                     options: UIScene.ConnectionOptions) -> UISceneConfiguration {
         // Called when a new scene session is being created.
         // Use this method to select a configuration to create the new scene with.
-        return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
+        UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
     }
 
     func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
         // Called when the user discards a scene session.
-        // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions.
+        // If any sessions were discarded while the application was not running, this will be called shortly 
+        // after application:didFinishLaunchingWithOptions.
         // Use this method to release any resources that were specific to the discarded scenes, as they will not return.
     }
 
-
 }
-
diff --git a/star-dash/star-dash/Constants/PhysicsConstants.swift b/star-dash/star-dash/Constants/PhysicsConstants.swift
@@ -15,15 +15,17 @@ struct PhysicsConstants {
         static let obstacle: UInt32 = 0b01000
         static let tool: UInt32 = 0b10000
     }
+
     struct CollisionMask {
-        static let playerCollisionMask = CollisionCategory.monster | CollisionCategory.collectible | CollisionCategory.obstacle | CollisionCategory.tool
-
+        static let playerCollisionMask = CollisionCategory.monster
+            | CollisionCategory.collectible | CollisionCategory.obstacle | CollisionCategory.tool
+
         static let monsterCollisionMask = CollisionCategory.player | CollisionCategory.tool
-        
+
         static let collectibleCollisionMask = CollisionCategory.player
-        
+
         static let obstacleCollisionMask = CollisionCategory.player
-        
+
         static let toolCollisionMask = CollisionCategory.player | CollisionCategory.monster
     }
 }
diff --git a/star-dash/star-dash/Entities/Components/Component.swift b/star-dash/star-dash/Entities/Components/Component.swift
@@ -6,15 +6,15 @@
 //
 
 import Foundation
+
 typealias ComponentId = UUID
+
 class Component {
     var entityId: EntityId
     var id: ComponentId
-    
+
     init(id: ComponentId, entityId: EntityId) {
         self.id = id
         self.entityId = entityId
-
     }
-
 }
diff --git a/star-dash/star-dash/Entities/Components/HealthComponent.swift b/star-dash/star-dash/Entities/Components/HealthComponent.swift
@@ -9,12 +9,12 @@ import Foundation
 
 class HealthComponent: Component {
     var health: Int
-    
+
     init(id: ComponentId, entityId: EntityId, health: Int) {
         self.health = health
         super.init(id: id, entityId: entityId)
     }
-    
+
     convenience init(entityId: EntityId, health: Int) {
         self.init(id: UUID(), entityId: entityId, health: health)
     }

diff --git a/star-dash/star-dash/Entities/Components/PhysicsComponent.swift b/star-dash/star-dash/Entities/Components/PhysicsComponent.swift
@@ -13,17 +13,20 @@ class PhysicsComponent: Component {
     var force: CGVector
     var collisionMask: UInt32
     var affectedByGravity: Bool
-
-    init(id: ComponentId, entityId: EntityId, mass: CGFloat, velocity: CGVector, force: CGVector, collisionMask: UInt32, affectedByGravity: Bool) {
+
+    init(id: ComponentId, entityId: EntityId, mass: CGFloat, velocity: CGVector,
+         force: CGVector, collisionMask: UInt32, affectedByGravity: Bool) {
         self.mass = mass
         self.velocity = velocity
         self.force = force
         self.collisionMask = collisionMask
         self.affectedByGravity = affectedByGravity
         super.init(id: id, entityId: entityId)
     }
-
-    convenience init(entityId: EntityId, mass: CGFloat, velocity: CGVector, force: CGVector, collisionMask: UInt32, affectedByGravity: Bool) {
-        self.init(id: UUID(), entityId: entityId, mass: mass, velocity: velocity, force: force, collisionMask: collisionMask, affectedByGravity: affectedByGravity)
+
+    convenience init(entityId: EntityId, mass: CGFloat, velocity: CGVector,
+                     force: CGVector, collisionMask: UInt32, affectedByGravity: Bool) {
+        self.init(id: UUID(), entityId: entityId, mass: mass, velocity: velocity,
+                  force: force, collisionMask: collisionMask, affectedByGravity: affectedByGravity)
     }
 }
diff --git a/star-dash/star-dash/Entities/Components/PositionComponent.swift b/star-dash/star-dash/Entities/Components/PositionComponent.swift
@@ -7,27 +7,25 @@
 
 import Foundation
 
-
 class PositionComponent: Component {
     var position: CGPoint
     var rotation: Float
-    
+
     init(id: UUID, entityId: UUID, position: CGPoint, rotation: Float) {
         self.position = position
         self.rotation = rotation
         super.init(id: id, entityId: entityId)
     }
-    
+
     convenience init(entityId: UUID, position: CGPoint, rotation: Float) {
         self.init(id: UUID(), entityId: entityId, position: position, rotation: rotation)
     }
-    
+
     func setPosition(position: CGPoint) {
         self.position = position
     }
-    
+
     func setRotation(rotation: Float) {
         self.rotation = rotation
     }
-
 }
diff --git a/star-dash/star-dash/Entities/Components/SpriteComponent.swift b/star-dash/star-dash/Entities/Components/SpriteComponent.swift
@@ -6,19 +6,21 @@
 //
 
 import Foundation
+
 class SpriteComponent: Component {
-    // sprite could be single image or sprite set, could use enum to seperate, for sprite set will need to discuss how to rep animation
+    // TODO: sprite could be single image or sprite set, could use enum to seperate, 
+    // for sprite set will need to discuss how to rep animation
     var image: String
     var size: CGSize
-    
+
     init(id: ComponentId, entityId: EntityId, image: String, size: CGSize) {
         self.image = image
         self.size = size
         super.init(id: id, entityId: entityId)
     }
-    
+
     convenience init(entityId: EntityId, image: String, size: CGSize) {
         self.init(id: UUID(), entityId: entityId, image: image, size: size)
     }
-    
+
 }
diff --git a/star-dash/star-dash/Entities/Entity.swift b/star-dash/star-dash/Entities/Entity.swift
@@ -6,10 +6,11 @@
 //
 
 import Foundation
+
 typealias EntityId = UUID
 
 protocol Entity {
     var id: EntityId {get}
-    
+
     func setUpAndAdd(to: EntityManager)
 }
diff --git a/star-dash/star-dash/Entities/EntityManager.swift b/star-dash/star-dash/Entities/EntityManager.swift
@@ -6,32 +6,35 @@
 //
 
 import Foundation
+
 typealias ComponentSet = Set<ComponentId>
 typealias ComponentMap = [ComponentId: Component]
 typealias EntityMap = [EntityId: Entity]
 typealias EntityComponentMap = [EntityId: ComponentSet]
+
 class EntityManager {
     var componentMap: ComponentMap
     var entityMap: EntityMap
     var entityComponentMap: EntityComponentMap
+
     init(componentMap: ComponentMap, entityMap: EntityMap, entityComponentMap: EntityComponentMap) {
         self.componentMap = componentMap
         self.entityMap = entityMap
         self.entityComponentMap = entityComponentMap
     }
-    
+
     convenience init() {
         self.init(componentMap: .init(), entityMap: .init(), entityComponentMap: .init())
     }
-    
+
     func add(component: Component) {
         guard self.componentMap[component.id] != nil else {
             return
         }
         self.componentMap[component.id] = component
         self.entityComponentMap[component.entityId]?.insert(component.id)
     }
-    
+
     func add(entity: Entity) {
         guard self.entityMap[entity.id] != nil else {
             return

diff --git a/star-dash/star-dash/Entities/GameEntities/Collectible.swift b/star-dash/star-dash/Entities/GameEntities/Collectible.swift
@@ -10,17 +10,16 @@ import Foundation
 class Collectible: Entity {
     let id: EntityId
     private let position: CGPoint
-    
+
     init(id: EntityId, position: CGPoint) {
         self.id = id
         self.position = position
     }
-    
+
     convenience init(position: CGPoint) {
         self.init(id: UUID(), position: position)
     }
-
-
+
     func setUpAndAdd(to: EntityManager) {
         let positionComponent = PositionComponent(entityId: self.id, position: self.position, rotation: .zero)
         let physicsComponent = PhysicsComponent(
@@ -30,7 +29,7 @@ class Collectible: Entity {
             force: .zero,
             collisionMask: PhysicsConstants.CollisionMask.collectibleCollisionMask,
             affectedByGravity: false)
-        
+
         to.add(entity: self)
         to.add(component: positionComponent)
         to.add(component: physicsComponent)

diff --git a/star-dash/star-dash/Entities/GameEntities/Monster.swift b/star-dash/star-dash/Entities/GameEntities/Monster.swift
@@ -6,20 +6,20 @@
 //
 
 import Foundation
+
 class Monster: Entity {
     let id: EntityId
     private let position: CGPoint
-    
+
     init(id: EntityId, position: CGPoint) {
         self.id = id
         self.position = position
     }
-    
+
     convenience init(position: CGPoint) {
         self.init(id: UUID(), position: position)
     }
-
-
+
     func setUpAndAdd(to: EntityManager) {
         let positionComponent = PositionComponent(entityId: self.id, position: self.position, rotation: .zero)
         let healthComponent = HealthComponent(entityId: self.id, health: 100)
@@ -30,8 +30,7 @@ class Monster: Entity {
             force: .zero,
             collisionMask: PhysicsConstants.CollisionMask.monsterCollisionMask,
             affectedByGravity: false)
-
-
+
         to.add(entity: self)
         to.add(component: positionComponent)
         to.add(component: healthComponent)

diff --git a/star-dash/star-dash/Entities/GameEntities/Obstacle.swift b/star-dash/star-dash/Entities/GameEntities/Obstacle.swift
@@ -10,17 +10,16 @@ import Foundation
 class Obstacle: Entity {
     let id: EntityId
     private let position: CGPoint
-    
+
     init(id: EntityId, position: CGPoint) {
         self.id = id
         self.position = position
     }
-    
+
     convenience init(position: CGPoint) {
         self.init(id: UUID(), position: position)
     }
-
-
+
     func setUpAndAdd(to: EntityManager) {
         let positionComponent = PositionComponent(entityId: self.id, position: self.position, rotation: .zero)
         let physicsComponent = PhysicsComponent(
@@ -30,7 +29,7 @@ class Obstacle: Entity {
             force: .zero,
             collisionMask: PhysicsConstants.CollisionMask.obstacleCollisionMask,
             affectedByGravity: false)
-        
+
         to.add(entity: self)
         to.add(component: positionComponent)
         to.add(component: physicsComponent)

diff --git a/star-dash/star-dash/Entities/GameEntities/Player.swift b/star-dash/star-dash/Entities/GameEntities/Player.swift
@@ -6,21 +6,22 @@
 //
 
 import Foundation
+
 class Player: Entity {
     let id: EntityId
     private let position: CGPoint
     private let playerSprite: PlayerSprite
+
     init(id: EntityId, position: CGPoint, playerSprite: PlayerSprite) {
         self.id = id
         self.position = position
         self.playerSprite = playerSprite
     }
-    
+
     convenience init(position: CGPoint, playerSprite: PlayerSprite) {
         self.init(id: UUID(), position: position, playerSprite: playerSprite)
     }
-
-
+
     func setUpAndAdd(to: EntityManager) {
         let positionComponent = PositionComponent(entityId: self.id, position: self.position, rotation: .zero)
         let healthComponent = HealthComponent(entityId: self.id, health: 100)
@@ -31,9 +32,9 @@ class Player: Entity {
             force: .zero,
             collisionMask: PhysicsConstants.CollisionMask.playerCollisionMask,
             affectedByGravity: true)
-        
+
         let spriteComponent = SpriteComponent(entityId: self.id, image: "", size: .zero)
-        
+
         to.add(entity: self)
         to.add(component: positionComponent)
         to.add(component: healthComponent)

diff --git a/star-dash/star-dash/Entities/GameEntities/Tool.swift b/star-dash/star-dash/Entities/GameEntities/Tool.swift
@@ -10,17 +10,16 @@ import Foundation
 class Tool: Entity {
     let id: EntityId
     private let position: CGPoint
-    
+
     init(id: EntityId, position: CGPoint) {
         self.id = id
         self.position = position
     }
-    
+
     convenience init(position: CGPoint) {
         self.init(id: UUID(), position: position)
     }
-
-
+
     func setUpAndAdd(to: EntityManager) {
         let positionComponent = PositionComponent(entityId: self.id, position: self.position, rotation: .zero)
         let physicsComponent = PhysicsComponent(
@@ -30,7 +29,7 @@ class Tool: Entity {
             force: .zero,
             collisionMask: PhysicsConstants.CollisionMask.toolCollisionMask,
             affectedByGravity: false)
-        
+
         to.add(entity: self)
         to.add(component: positionComponent)
         to.add(component: physicsComponent)

diff --git a/star-dash/star-dash/Enums/PlayerSprite.swift b/star-dash/star-dash/Enums/PlayerSprite.swift
@@ -6,6 +6,7 @@
 //
 
 import Foundation
+
 enum PlayerSprite: String {
     case RedNose = "red-nose"
 }