Adjust Font isolation

STREGAsGate · May 2, 2023 · 12b2635 · 12b2635
1 parent b4427e4
commit 12b2635
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Sources/GateEngine/System/Rendering/Resources/Text/Backends/TTFFont.swift b/Sources/GateEngine/System/Rendering/Resources/Text/Backends/TTFFont.swift
@@ -132,7 +132,7 @@ fileprivate func getBakedQuad(characterData: [CharData], pixelsWidth: Int32, pix
         self.characterDatas[key] = charData
     }
 
-    var preferredSampleFilter: Text.SampleFilter {.linear}
+    nonisolated var preferredSampleFilter: Text.SampleFilter {.linear}
 }
 
 #endif
diff --git a/Sources/GateEngine/System/Rendering/Resources/Text/Font.swift b/Sources/GateEngine/System/Rendering/Resources/Text/Font.swift
@@ -23,10 +23,10 @@ struct AlignedCharacter {
 }
 
 protocol FontBackend {
-    var preferredSampleFilter: Text.SampleFilter {get}
+    nonisolated var preferredSampleFilter: Text.SampleFilter {get}
     @MainActor mutating func texture(forKey key: Font.Key) -> Texture
-    mutating func characterData(forKey key: Font.Key, character: Character) -> CharacterData
-    mutating func alignedCharacter(forKey key: Font.Key, character: Character, origin: Position2, xAdvance: inout Float) -> AlignedCharacter
+    @MainActor mutating func characterData(forKey key: Font.Key, character: Character) -> CharacterData
+    @MainActor mutating func alignedCharacter(forKey key: Font.Key, character: Character, origin: Position2, xAdvance: inout Float) -> AlignedCharacter
 }
 
 public class Font: OldResource {
@@ -77,12 +77,12 @@ public class Font: OldResource {
         }
     }
 
-    func characterData(forCharacter character: Character, pointSize: UInt, style: Font.Style) -> CharacterData {
+    @MainActor func characterData(forCharacter character: Character, pointSize: UInt, style: Font.Style) -> CharacterData {
         let key = Key(style: style, pointSize: pointSize)
         return backend.characterData(forKey: key, character: character)
     }
 
-    func alignedCharacter(forCharacter character: Character, pointSize: UInt, style: Font.Style, origin: Position2, xAdvance: inout Float) -> AlignedCharacter {
+    @MainActor func alignedCharacter(forCharacter character: Character, pointSize: UInt, style: Font.Style, origin: Position2, xAdvance: inout Float) -> AlignedCharacter {
         let key = Key(style: style, pointSize: pointSize)
         return backend.alignedCharacter(forKey: key, character: character, origin: origin, xAdvance: &xAdvance)
     }

diff --git a/Sources/GateEngine/System/Rendering/Resources/Text/Text.swift b/Sources/GateEngine/System/Rendering/Resources/Text/Text.swift
@@ -132,7 +132,7 @@ public final class Text {
         #endif
     }
 
-    private static func rawGeometry(fromString string: String, font: Font, pointSize: Float, style: Font.Style, paragraphWidth: Float?, interfaceScale: Float) -> (RawGeometry, Size2) {
+    @MainActor private static func rawGeometry(fromString string: String, font: Font, pointSize: Float, style: Font.Style, paragraphWidth: Float?, interfaceScale: Float) -> (RawGeometry, Size2) {
         let roundedPointSize = UInt(pointSize.rounded())
 
         var triangles: [Triangle] = []