diff --git a/components/render/ios/renderAux.swift b/components/render/ios/renderAux.swift index 24316a9..46205ef 100644 --- a/components/render/ios/renderAux.swift +++ b/components/render/ios/renderAux.swift @@ -1,5 +1,9 @@ import UIKit +func renderDraw(_ vm: RenderVM) { + raybriRender(vm.pixelSize[0], vm.pixelSize[1]) +} + func renderPixelSize(_ view: UIView) -> [Int32] { let scale = view.contentScaleFactor let w = Int32(max(1, (view.bounds.width * scale).rounded())) diff --git a/components/render/ios/renderConst.swift b/components/render/ios/renderConst.swift new file mode 100644 index 0000000..7b0a7c8 --- /dev/null +++ b/components/render/ios/renderConst.swift @@ -0,0 +1,3 @@ +// iOS render constants. The macOS renderConst.swift depends on AppKit, so the +// two platforms keep separate files. +let RENDER_FPS = 60.0 diff --git a/components/render/ios/renderEffect.swift b/components/render/ios/renderEffect.swift index 03b386b..4395f38 100644 --- a/components/render/ios/renderEffect.swift +++ b/components/render/ios/renderEffect.swift @@ -1,11 +1,31 @@ import Foundation +import QuartzCore +import UIKit + +func renderDeinit(_ vm: RenderVM) { + vm.timer?.invalidate() + vm.timer = nil + raybriShutdown() +} func renderInit(_ vm: RenderVM) { - vm.glView.openGLContext?.makeCurrentContext() - - // Enable VSync - var swapInterval: Int32 = 1 - vm.glView.openGLContext?.setValues(&swapInterval, for: .swapInterval) - - raybriInit(nil) + // UIKit has no NSOpenGLContext: EGL/ANGLE renders into the view's layer, + // so the layer is what the bridge needs to create its surface from. + let layer = Unmanaged.passUnretained(vm.glView.layer).toOpaque() + raybriInit(layer) +} + +func renderStartTimer(_ vm: RenderVM) { + // Make a time mark for calculating time delta + vm.startTime = CACurrentMediaTime() + + // Unlike macOS, UIKit never calls draw(_:) on the view, so the timer + // renders each frame itself. + let timer = Timer(timeInterval: 1.0 / RENDER_FPS, repeats: true) { [weak vm] _ in + guard let vm else { return } + renderDraw(vm) + } + vm.timer = timer + // .common means holding buttons in UI does not pause this rendering timer + RunLoop.main.add(timer, forMode: .common) } diff --git a/ogs-blue/ver-ios/src/render/renderConst.swift b/ogs-blue/ver-ios/src/render/renderConst.swift new file mode 120000 index 0000000..ff2ffaf --- /dev/null +++ b/ogs-blue/ver-ios/src/render/renderConst.swift @@ -0,0 +1 @@ +../../../../components/render/ios/renderConst.swift \ No newline at end of file diff --git a/ogs-blue/ver-ios/src/render/renderTMPIOS.swift b/ogs-blue/ver-ios/src/render/renderTMPIOS.swift deleted file mode 100644 index 3fba957..0000000 --- a/ogs-blue/ver-ios/src/render/renderTMPIOS.swift +++ /dev/null @@ -1,2 +0,0 @@ -func renderDeinit(_ vm: RenderVM) { } -func renderStartTimer(_ vm: RenderVM) { }