Support iOS for ogs-blue #7
No files matched your search
@@ -5,8 +5,9 @@ import UIKit
|
|||||||
func renderDeinit(_ vm: RenderVM) {
|
func renderDeinit(_ vm: RenderVM) {
|
||||||
vm.timer?.invalidate()
|
vm.timer?.invalidate()
|
||||||
vm.timer = nil
|
vm.timer = nil
|
||||||
guard eglMakeCurrentContext(&vm.glView.st) else { return }
|
eglMakeCurrentContext(&vm.glView.st)
|
||||||
raybriShutdown()
|
raybriShutdown()
|
||||||
|
|
||||||
eglMakeCurrent(vm.glView.st.display, nil, nil, nil)
|
eglMakeCurrent(vm.glView.st.display, nil, nil, nil)
|
||||||
eglDestroySurface(vm.glView.st.display, vm.glView.st.surface)
|
eglDestroySurface(vm.glView.st.display, vm.glView.st.surface)
|
||||||
eglDestroyContext(vm.glView.st.display, vm.glView.st.ctx)
|
eglDestroyContext(vm.glView.st.display, vm.glView.st.ctx)
|
||||||
@@ -14,8 +15,7 @@ func renderDeinit(_ vm: RenderVM) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func renderInit(_ vm: RenderVM) {
|
func renderInit(_ vm: RenderVM) {
|
||||||
// UIKit has no NSOpenGLContext: EGL/ANGLE renders into the view's layer,
|
// On iOS EGL/ANGLE renders into the UIView's layer
|
||||||
// so the layer is what the bridge needs to create its surface from.
|
|
||||||
let layer = Unmanaged.passUnretained(vm.glView.layer).toOpaque()
|
let layer = Unmanaged.passUnretained(vm.glView.layer).toOpaque()
|
||||||
vm.glView.st.caLayer = layer
|
vm.glView.st.caLayer = layer
|
||||||
|
|
||||||
@@ -32,7 +32,7 @@ func renderStartTimer(_ vm: RenderVM) {
|
|||||||
|
|
||||||
// The frame is presented by eglSwapBuffers into the view's layer, not by
|
// The frame is presented by eglSwapBuffers into the view's layer, not by
|
||||||
// CoreGraphics, so the timer drives the rendering itself instead of
|
// CoreGraphics, so the timer drives the rendering itself instead of
|
||||||
// invalidating the view for a draw(_:) pass the way macOS does.
|
// invalidating the view for a draw(_:) pass the way macOS does
|
||||||
let timer = Timer(timeInterval: 1.0 / RENDER_FPS, repeats: true) { [weak vm] _ in
|
let timer = Timer(timeInterval: 1.0 / RENDER_FPS, repeats: true) { [weak vm] _ in
|
||||||
guard let vm else { return }
|
guard let vm else { return }
|
||||||
renderDraw(vm)
|
renderDraw(vm)
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ final class RenderGLView: UIView {
|
|||||||
|
|
||||||
override init(frame: CGRect) {
|
override init(frame: CGRect) {
|
||||||
super.init(frame: frame)
|
super.init(frame: frame)
|
||||||
|
|
||||||
isOpaque = true
|
isOpaque = true
|
||||||
isUserInteractionEnabled = false
|
isUserInteractionEnabled = false
|
||||||
}
|
}
|
||||||
@@ -14,6 +13,10 @@ final class RenderGLView: UIView {
|
|||||||
fatalError("init(coder:) has not been implemented")
|
fatalError("init(coder:) has not been implemented")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
deinit {
|
||||||
|
renderSet(F.willDeinit, true)
|
||||||
|
}
|
||||||
|
|
||||||
override func didMoveToWindow() {
|
override func didMoveToWindow() {
|
||||||
super.didMoveToWindow()
|
super.didMoveToWindow()
|
||||||
guard let window else { return }
|
guard let window else { return }
|
||||||
|
|||||||
@@ -3,8 +3,8 @@ import RaylibBridge
|
|||||||
import QuartzCore
|
import QuartzCore
|
||||||
|
|
||||||
func renderDeinit(_ vm: RenderVM) {
|
func renderDeinit(_ vm: RenderVM) {
|
||||||
print("ИГР renderD")
|
|
||||||
vm.timer?.invalidate()
|
vm.timer?.invalidate()
|
||||||
|
vm.timer = nil
|
||||||
vm.glView.openGLContext?.makeCurrentContext()
|
vm.glView.openGLContext?.makeCurrentContext()
|
||||||
raybriShutdown()
|
raybriShutdown()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,17 @@ final class RenderGLView: NSOpenGLView {
|
|||||||
fatalError("init(coder:) has not been implemented")
|
fatalError("init(coder:) has not been implemented")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
deinit {
|
||||||
|
renderSet(F.willDeinit, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
override func draw(_ dirtyRect: NSRect) {
|
||||||
|
let vm = RenderVM.shared!
|
||||||
|
if vm.didPrepareGL {
|
||||||
|
renderDraw(vm)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override func prepareOpenGL() {
|
override func prepareOpenGL() {
|
||||||
super.prepareOpenGL()
|
super.prepareOpenGL()
|
||||||
renderSet(F.didPrepareMacGL, true)
|
renderSet(F.didPrepareMacGL, true)
|
||||||
@@ -33,15 +44,4 @@ final class RenderGLView: NSOpenGLView {
|
|||||||
let ps = renderPixelSize(self)
|
let ps = renderPixelSize(self)
|
||||||
renderSet(F.backingPixelSize, ps)
|
renderSet(F.backingPixelSize, ps)
|
||||||
}
|
}
|
||||||
|
|
||||||
override func draw(_ dirtyRect: NSRect) {
|
|
||||||
let vm = RenderVM.shared!
|
|
||||||
if vm.didPrepareGL {
|
|
||||||
renderDraw(vm)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
deinit {
|
|
||||||
renderSet(F.willDeinit, true)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
import AppKit
|
import AppKit
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
/// Render view for SwiftUI
|
|
||||||
struct RenderView: NSViewRepresentable {
|
struct RenderView: NSViewRepresentable {
|
||||||
func makeNSView(context: Context) -> RenderGLView {
|
func makeNSView(context: Context) -> RenderGLView {
|
||||||
RenderVM.shared!.glView
|
RenderVM.shared!.glView
|
||||||
|
|||||||
Reference in new issue
Block a user