diff --git a/components/render/ios/RenderVM.swift b/components/render/ios/RenderVM.swift deleted file mode 100644 index 3a21125..0000000 --- a/components/render/ios/RenderVM.swift +++ /dev/null @@ -1,16 +0,0 @@ -import Combine -import Foundation - -// iOS counterpart of the macOS RenderVM: it owns the view raylib draws into -// and the timer that drives it. The actual rendering lives in raybriIOS.mm. -final class RenderVM: ObservableObject { - static private(set) weak var shared: RenderVM? - - let glView = RenderGLView(frame: .zero) - var startTime: CFTimeInterval = 0 - var timer: Timer? - - init() { - Self.shared = self - } -} diff --git a/components/render/ios/RenderVM.swift b/components/render/ios/RenderVM.swift new file mode 120000 index 0000000..05cef35 --- /dev/null +++ b/components/render/ios/RenderVM.swift @@ -0,0 +1 @@ +../renderVM.swift \ No newline at end of file diff --git a/components/render/ios/view/RenderGLView.swift b/components/render/ios/view/RenderGLView.swift index b169770..8bcacea 100644 --- a/components/render/ios/view/RenderGLView.swift +++ b/components/render/ios/view/RenderGLView.swift @@ -6,8 +6,6 @@ import UIKit // and when its backing size changes. final class RenderGLView: UIView { private weak var renderVM: RenderVM? - private var didInit = false - private var lastPixelSize: [Int32] = [0, 0] override init(frame: CGRect) { super.init(frame: frame) @@ -32,29 +30,29 @@ final class RenderGLView: UIView { contentScaleFactor = window.screen.nativeScale layer.contentsScale = contentScaleFactor - guard !didInit, let vm = RenderVM.shared else { return } + guard let vm = RenderVM.shared, !vm.didPrepareGL else { return } guard renderInit(vm) else { return } renderVM = vm - didInit = true - lastPixelSize = renderPixelSize(self) + vm.didPrepareGL = true + vm.pixelSize = renderPixelSize(self) renderStartTimer(vm) } override func layoutSubviews() { super.layoutSubviews() - guard didInit else { return } + guard let vm = renderVM, vm.didPrepareGL else { return } let size = renderPixelSize(self) - guard size != lastPixelSize else { return } + guard size != vm.pixelSize else { return } - lastPixelSize = size + vm.pixelSize = size raybri_ios_resize(size[0], size[1]) } deinit { - guard didInit, let vm = renderVM else { return } + guard let vm = renderVM, vm.didPrepareGL else { return } renderDeinit(vm) } }