Feat/extend background image

star-dash/star-dash/GameEngine/GameEngine.swift

@@ -12,10 +12,13 @@ class GameEngine {
     private let entityManager: EntityManager
     private let eventManager: EventManager
 
-    init() {
+    let mapSize: CGSize
+
+    init(mapSize: CGSize) {
         self.systemManager = SystemManager()
         self.entityManager = EntityManager()
         self.eventManager = EventManager()
+        self.mapSize = mapSize
 
         setUpSystems()
     }
@@ -29,7 +32,8 @@ class GameEngine {
 
         return GameInfo(
             playerScore: score,
-            playersInfo: playersInfo(of: playerIndex)
+            playersInfo: playersInfo(of: playerIndex),
+            mapSize: mapSize
         )
     }
 

star-dash/star-dash/GameEngine/GameInfo.swift

@@ -1,4 +1,7 @@
+import CoreGraphics
+
 struct GameInfo {
     let playerScore: Int
     let playersInfo: [PlayerInfo]
+    let mapSize: CGSize
 }

star-dash/star-dash/Persistence/Data/data.json

@@ -1,7 +1,7 @@
 {
 "id": 0,
   "name": "1",
-  "size": [1000, 200],
+  "size": [4842, 1040],
   "obstacles": [
     {
       "levelId": 0,

star-dash/star-dash/Persistence/StorageManager.swift

@@ -14,6 +14,10 @@ class StorageManager {
         database = Database()
     }
 
+    func getLevelSize(id: Int64) -> CGSize? {
+        self.database.getLevelPersistable(id: id)?.size
+    }
+
     func loadLevel(id: Int64, into entityManager: EntityManagerInterface) {
         let entityPersistables = self.database.getAllEntities(levelId: id)
 

star-dash/star-dash/Rendering/OverlayInfo.swift

@@ -1,4 +1,7 @@
+import CoreGraphics
+
 struct OverlayInfo {
     let score: Int
     let playersInfo: [PlayerInfo]
+    let mapSize: CGSize
 }

star-dash/star-dash/Rendering/PlayerView/MiniMapView.swift

@@ -33,8 +33,8 @@ class MiniMapView: UIView {
             mapImageView.heightAnchor.constraint(equalToConstant: 50)
         ])
     }
-    // TODO: Pass in actual map size
-    func update(playersInfo: [PlayerInfo], mapSize: CGSize = CGSize(width: 4_500, height: 0)) {
+
+    func update(playersInfo: [PlayerInfo], mapSize: CGSize) {
         removeAllPlayerIcons()
 
         for playerData in playersInfo {

star-dash/star-dash/Rendering/PlayerView/PlayerView.swift

@@ -54,7 +54,7 @@ class PlayerView {
 
     func update(_ overlayInfo: OverlayInfo) {
         overlayView.update(overlayInfo.score)
-        minimapView.update(playersInfo: overlayInfo.playersInfo)
+        minimapView.update(playersInfo: overlayInfo.playersInfo, mapSize: overlayInfo.mapSize)
     }
 
     static func createPlayerView(layout: PlayerViewLayout, device: MTLDevice) -> PlayerView {

star-dash/star-dash/ViewController.swift

@@ -18,15 +18,18 @@ class ViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        let scene = GameScene(size: CGSize(width: 4_842, height: 1_040))
-        scene.scaleMode = .aspectFill
-        scene.sceneDelegate = self
-        self.scene = scene
-        let gameEngine = GameEngine()
+        self.storageManager = StorageManager()
+
+        let gameEngine = createGameEngine()
         self.gameEngine = gameEngine
+
+        let scene = createGameScene(of: gameEngine.mapSize)
+        self.scene = scene
+
         self.gameBridge = GameBridge(entityManager: gameEngine, scene: scene)
-        self.storageManager = StorageManager()
+
         setupGameEntities()
+        setupBackground()
 
         guard let renderer = MTKRenderer(scene: scene) else {
             return
@@ -37,17 +40,24 @@ class ViewController: UIViewController {
         self.renderer = renderer
     }
 
-    func setupGameEntities() {
+    private func createGameEngine() -> GameEngine {
+        let levelSize = self.storageManager?.getLevelSize(id: 0) ?? CGSize(width: 4_842, height: 1_040)
+        return GameEngine(mapSize: levelSize)
+    }
+
+    private func createGameScene(of size: CGSize) -> GameScene {
+        let scene = GameScene(size: size)
+        scene.scaleMode = .aspectFill
+        scene.sceneDelegate = self
+        return scene
+    }
+
+    private func setupGameEntities() {
         guard let scene = self.scene,
               let gameEngine = self.gameEngine else {
             return
         }
 
-        let background = SDSpriteObject(imageNamed: "GameBackground")
-        background.position = CGPoint(x: scene.size.width / 2, y: scene.size.height / 2)
-        background.zPosition = -1
-        scene.addObject(background)
-
         EntityFactory.createAndAddPlayer(to: gameEngine,
                                          playerIndex: 0,
                                          position: CGPoint(x: 100, y: scene.size.height / 2 + 200))
@@ -68,6 +78,28 @@ class ViewController: UIViewController {
 
         self.storageManager?.loadLevel(id: 0, into: gameEngine)
     }
+
+    private func setupBackground() {
+        guard let scene = self.scene else {
+            return
+        }
+        let background = SDSpriteObject(imageNamed: "GameBackground")
+        let backgroundWidth = background.size.width
+        let backgroundHeight = background.size.height
+
+        var remainingGameWidth = scene.size.width
+        var numOfAddedBackgrounds = 0
+        while remainingGameWidth > 0 {
+            let background = SDSpriteObject(imageNamed: "GameBackground")
+            let offset = CGFloat(numOfAddedBackgrounds) * backgroundWidth
+            background.position = CGPoint(x: backgroundWidth / 2 + offset, y: backgroundHeight / 2)
+            background.zPosition = -1
+            scene.addObject(background)
+
+            remainingGameWidth -= backgroundWidth
+            numOfAddedBackgrounds += 1
+        }
+    }
 }
 
 extension ViewController: SDSceneDelegate {
@@ -109,7 +141,8 @@ extension ViewController: ViewDelegate {
 
         return OverlayInfo(
             score: gameInfo.playerScore,
-            playersInfo: gameInfo.playersInfo
+            playersInfo: gameInfo.playersInfo,
+            mapSize: gameInfo.mapSize
         )
     }
 }