Issue #149 textures with higher resolutions

Sources/Core/API/TextureManager.swift

@@ -23,6 +23,9 @@ public final class TextureManager {
     /// Which mode to use in case an error was encountered when loading a texture (default = .ignore)
     /// This is considered only in DEBUG mode.
     public var errorMode: ErrorMode = .ignore
+    /// The maximum screen scale value allowed
+    /// It's used when there are no assets for textures in proper scales are found
+    private let maxAllowedScale: Int = Int(Screen.maxScreenScale)
 
     internal private(set) var cache = [String : LoadedTexture]()
 
@@ -47,8 +50,11 @@ public final class TextureManager {
 
     // MARK: - Internal
 
-    internal func load(_ texture: Texture, namePrefix additionalNamePrefix: String?, scale: Int?) -> LoadedTexture? {
+    internal func load(_ texture: Texture, namePrefix additionalNamePrefix: String?,
+                       scale: Int?, otherAllowedScales: [Int]? = nil) -> LoadedTexture? {
         let scale = scale ?? defaultScale
+        var otherAllowedScales = otherAllowedScales ?? allowedScales(beside: scale)
+
         let format = texture.format ?? defaultFormat
         var name = texture.name
 
@@ -76,7 +82,7 @@ public final class TextureManager {
         }
 
         guard let image = imageLoader.loadImageForTexture(named: name, scale: scale, format: format) else {
-            guard scale > 1 else {
+            guard otherAllowedScales.count > 0 else {
                 #if DEBUG
                 let errorMessage = "Texture image named '\(name)' could not be found"
 
@@ -93,13 +99,24 @@ public final class TextureManager {
                 return nil
             }
 
-            return load(texture, namePrefix: namePrefix, scale: scale - 1)
+            return load(texture, namePrefix: namePrefix,
+                        scale: otherAllowedScales.removeLast(), otherAllowedScales: otherAllowedScales)
         }
 
         let texture = LoadedTexture(image: image, scale: scale)
         cache[cacheKey] = texture
         return texture
     }
+
+    // MARK: - Private
+
+    func allowedScales(beside defaultValue: Int?) -> [Int] {
+        let minScale = 1
+        let maxScale = maxAllowedScale
+
+        return [Int](minScale...maxScale)
+            .filter { defaultValue == nil || $0 != defaultValue }
+    }
 }
 
 public extension TextureManager {

Sources/Core/Internal/Screen-iOS.swift

@@ -10,4 +10,8 @@ internal extension Screen {
     static var mainScreenScale: Metric {
         return main.scale
     }
+
+    static var maxScreenScale: Metric {
+        return 3
+    }
 }

Sources/Core/Internal/Screen-macOS.swift

@@ -11,4 +11,8 @@ internal extension Screen {
     static var mainScreenScale: CGFloat {
         return Screen.main?.backingScaleFactor ?? 1
     }
+
+    static var maxScreenScale: Metric {
+        return 2
+    }
 }

Tests/ImagineEngineTests/ActorTests.swift

@@ -106,6 +106,8 @@ final class ActorTests: XCTestCase {
         game.update()
         XCTAssertEqual(actor.size, Size(width: 100, height: 50))
 
+        game.textureImageLoader.images["sheet2.png"] = image.cgImage
+
         // Assigning new sprite sheet mid-animation should update the animation
         var newAnimation = Animation(
             spriteSheetNamed: "sheet2",
@@ -117,10 +119,17 @@ final class ActorTests: XCTestCase {
         actor.animation = newAnimation
 
         game.update()
+
         XCTAssertEqual(game.textureImageLoader.imageNames, ["sheet.png", "sheet2.png"])
     }
 
     func testDefaultAnimationTextureFormatIsPNG() {
+        let imageSize = Size(width: 200, height: 150)
+        let image = ImageMockFactory.makeImage(withSize: imageSize)
+
+        game.textureImageLoader.images["Animation/0.png"] = image.cgImage
+        game.textureImageLoader.images["Animation/1.png"] = image.cgImage
+
         var animation = Animation(
             name: "Animation",
             frameCount: 2,
@@ -138,6 +147,12 @@ final class ActorTests: XCTestCase {
     }
 
     func testAnimatingWithJPGTextures() {
+        let imageSize = Size(width: 200, height: 150)
+        let image = ImageMockFactory.makeImage(withSize: imageSize)
+
+        game.textureImageLoader.images["Animation/0.jpg"] = image.cgImage
+        game.textureImageLoader.images["Animation/1.jpg"] = image.cgImage
+
         var animation = Animation(
             name: "Animation",
             frameCount: 2,
@@ -156,12 +171,22 @@ final class ActorTests: XCTestCase {
     }
 
     func testInitializingWithTextureName() {
+        let imageSize = Size(width: 200, height: 150)
+        let image = ImageMockFactory.makeImage(withSize: imageSize)
+
+        game.textureImageLoader.images["SomeTexture.png"] = image.cgImage
+
         let actor = Actor(textureNamed: "SomeTexture", scale: 1)
         game.scene.add(actor)
         XCTAssertEqual(game.textureImageLoader.imageNames, ["SomeTexture.png"])
     }
 
     func testTextureNamePrefix() {
+        let imageSize = Size(width: 200, height: 150)
+        let image = ImageMockFactory.makeImage(withSize: imageSize)
+
+        game.textureImageLoader.images["PrefixTexture.png"] = image.cgImage
+
         actor.textureNamePrefix = "Prefix"
         actor.animation = Animation(textureNamed: "Texture", scale: 1)
 

Tests/ImagineEngineTests/TextureManagerTests.swift

@@ -61,13 +61,17 @@ class TextureManagerTests: XCTestCase {
     }
 
     func testApplyingTextureNamePrefix() {
+        let image = makeImage()
+        imageLoader.images["PrefixTexture.png"] = image
+
         let texture = Texture(name: "Texture")
         manager.namePrefix = "Prefix"
 
         _ = manager.load(texture, namePrefix: nil, scale: 1)
         XCTAssertEqual(imageLoader.imageNames, ["PrefixTexture.png"])
 
         // When an additional name prefix is passed in, both prefixes should be applied in sequence
+        imageLoader.images["PrefixSecondTexture.png"] = image
         _ = manager.load(texture, namePrefix: "Second", scale: 1)
         XCTAssertEqual(imageLoader.imageNames, ["PrefixTexture.png", "PrefixSecondTexture.png"])
     }