diff --git a/components/render/ios/renderEffect.swift b/components/render/ios/renderEffect.swift index 247f967..71c31df 100644 --- a/components/render/ios/renderEffect.swift +++ b/components/render/ios/renderEffect.swift @@ -5,8 +5,9 @@ import UIKit func renderDeinit(_ vm: RenderVM) { vm.timer?.invalidate() vm.timer = nil - guard eglMakeCurrentContext(&vm.glView.st) else { return } + eglMakeCurrentContext(&vm.glView.st) raybriShutdown() + eglMakeCurrent(vm.glView.st.display, nil, nil, nil) eglDestroySurface(vm.glView.st.display, vm.glView.st.surface) eglDestroyContext(vm.glView.st.display, vm.glView.st.ctx) @@ -14,8 +15,7 @@ func renderDeinit(_ vm: RenderVM) { } func renderInit(_ vm: RenderVM) { - // 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. + // On iOS EGL/ANGLE renders into the UIView's layer let layer = Unmanaged.passUnretained(vm.glView.layer).toOpaque() 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 // 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 guard let vm else { return } renderDraw(vm) diff --git a/components/render/ios/view/RenderGLView.swift b/components/render/ios/view/RenderGLView.swift index d054063..3c99009 100644 --- a/components/render/ios/view/RenderGLView.swift +++ b/components/render/ios/view/RenderGLView.swift @@ -5,7 +5,6 @@ final class RenderGLView: UIView { override init(frame: CGRect) { super.init(frame: frame) - isOpaque = true isUserInteractionEnabled = false } @@ -14,6 +13,10 @@ final class RenderGLView: UIView { fatalError("init(coder:) has not been implemented") } + deinit { + renderSet(F.willDeinit, true) + } + override func didMoveToWindow() { super.didMoveToWindow() guard let window else { return } diff --git a/components/render/mac/renderEffect.swift b/components/render/mac/renderEffect.swift index b246dcf..3b270f7 100644 --- a/components/render/mac/renderEffect.swift +++ b/components/render/mac/renderEffect.swift @@ -3,8 +3,8 @@ import RaylibBridge import QuartzCore func renderDeinit(_ vm: RenderVM) { - print("ИГР renderD") vm.timer?.invalidate() + vm.timer = nil vm.glView.openGLContext?.makeCurrentContext() raybriShutdown() } diff --git a/components/render/mac/view/RenderGLView.swift b/components/render/mac/view/RenderGLView.swift index 04acce2..ef1c690 100644 --- a/components/render/mac/view/RenderGLView.swift +++ b/components/render/mac/view/RenderGLView.swift @@ -15,6 +15,17 @@ final class RenderGLView: NSOpenGLView { 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() { super.prepareOpenGL() renderSet(F.didPrepareMacGL, true) @@ -33,15 +44,4 @@ final class RenderGLView: NSOpenGLView { let ps = renderPixelSize(self) renderSet(F.backingPixelSize, ps) } - - override func draw(_ dirtyRect: NSRect) { - let vm = RenderVM.shared! - if vm.didPrepareGL { - renderDraw(vm) - } - } - - deinit { - renderSet(F.willDeinit, true) - } } diff --git a/components/render/mac/view/RenderView.swift b/components/render/mac/view/RenderView.swift index 42a503f..bd154e9 100644 --- a/components/render/mac/view/RenderView.swift +++ b/components/render/mac/view/RenderView.swift @@ -1,7 +1,6 @@ import AppKit import SwiftUI -/// Render view for SwiftUI struct RenderView: NSViewRepresentable { func makeNSView(context: Context) -> RenderGLView { RenderVM.shared!.glView