From ff4613d8e6d6ac19f9726e9a9aab5b0e1104788a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=D0=9A=D0=B0=D0=BF?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BA=D0=BE?= Date: Tue, 20 Oct 2026 06:50:13 +0300 Subject: [PATCH] gl view done --- components/render/mac/view/RenderGLView.swift | 34 +++---------------- components/render/renderAux.swift | 12 +++++++ components/render/renderEffect.swift | 13 ++++++- components/render/renderVM.swift | 3 +- dialect.yml | 10 +++--- game/ver-mac/src/dialect.swift | 27 ++++++++++----- 6 files changed, 54 insertions(+), 45 deletions(-) diff --git a/components/render/mac/view/RenderGLView.swift b/components/render/mac/view/RenderGLView.swift index 192c47f..b5b2c3b 100644 --- a/components/render/mac/view/RenderGLView.swift +++ b/components/render/mac/view/RenderGLView.swift @@ -1,11 +1,7 @@ import AppKit -import QuartzCore -import RaylibBridge import SwiftUI final class RenderGLView: NSOpenGLView { - private var startTime: CFTimeInterval = 0 - override init(frame frameRect: NSRect) { guard let format = NSOpenGLPixelFormat(attributes: RENDER_OPENGL_ATTRS) @@ -22,10 +18,7 @@ final class RenderGLView: NSOpenGLView { override func prepareOpenGL() { super.prepareOpenGL() - - startTime = CACurrentMediaTime() - - renderSet(F.didPrepareGLContext, true) + renderSet(F.didPrepareGL, true) } override func reshape() { @@ -46,31 +39,12 @@ final class RenderGLView: NSOpenGLView { override func draw(_ dirtyRect: NSRect) { let vm = RenderVM.shared! - - guard - vm.didPrepareGLContext, - let context = openGLContext - else { - return + if vm.didPrepareGL { + renderDraw(vm) } - - context.makeCurrentContext() - - sr_resize(vm.pixelSize[0], vm.pixelSize[1]) - - let t = Float(CACurrentMediaTime() - startTime) - - sr_set_rotation(t * 6.0, t * 18.0, 0.0) - - sr_render() - - context.flushBuffer() } deinit { - print("ИГР RenderGV.deinit") - // TODO: renderTimer?.invalidate() - openGLContext?.makeCurrentContext() - sr_shutdown() + renderSet(F.willDeinit, true) } } diff --git a/components/render/renderAux.swift b/components/render/renderAux.swift index aa38d1b..d8000c3 100644 --- a/components/render/renderAux.swift +++ b/components/render/renderAux.swift @@ -1,4 +1,16 @@ import AppKit +import RaylibBridge + +func renderDraw(_ vm: RenderVM) { + vm.glView.openGLContext?.makeCurrentContext() + + sr_resize(vm.pixelSize[0], vm.pixelSize[1]) + let t = Float(CACurrentMediaTime() - vm.startTime) + sr_set_rotation(t * 6.0, t * 18.0, 0.0) + sr_render() + + vm.glView.openGLContext?.flushBuffer() +} func renderPixelSize(_ view: NSView) -> [Int32] { let backing = view.convertToBacking(view.bounds) diff --git a/components/render/renderEffect.swift b/components/render/renderEffect.swift index 7e95ae4..4758875 100644 --- a/components/render/renderEffect.swift +++ b/components/render/renderEffect.swift @@ -1,5 +1,13 @@ import Foundation import RaylibBridge +import QuartzCore + +func renderDeinit(_ vm: RenderVM) { + print("ИГР renderD") + vm.timer?.invalidate() + vm.glView.openGLContext?.makeCurrentContext() + sr_shutdown() +} func renderInit(_ vm: RenderVM) { vm.glView.openGLContext?.makeCurrentContext() @@ -27,11 +35,14 @@ func renderLoadCubeModel(_ vm: RenderVM) { } func renderStartTimer(_ vm: RenderVM) { + // Make a time mark for calculating time delta + vm.startTime = CACurrentMediaTime() + // Schedule repaints every once in FPS seconds let timer = Timer(timeInterval: 1.0 / RENDER_FPS, repeats: true) { [weak vm] _ in vm?.glView.needsDisplay = true } vm.timer = timer - // Use .common so that holding buttons in UI does not pause this rendering timer + // .common means holding buttons in UI does not pause this rendering timer RunLoop.main.add(timer, forMode: .common) } diff --git a/components/render/renderVM.swift b/components/render/renderVM.swift index dc83843..f4b6166 100644 --- a/components/render/renderVM.swift +++ b/components/render/renderVM.swift @@ -2,9 +2,10 @@ import Combine import Foundation final class RenderVM: ObservableObject { - var didPrepareGLContext = false + var didPrepareGL = false let glView = RenderGLView(frame: .zero) var pixelSize = [Int32]() + var startTime: CFTimeInterval = 0 var timer: Timer? static private(set) weak var shared: RenderVM? diff --git a/dialect.yml b/dialect.yml index a50260f..38933b7 100644 --- a/dialect.yml +++ b/dialect.yml @@ -10,20 +10,22 @@ RenderContext: backingPixelSize: [Int32] didClickIncrement: Bool didLaunch: Bool - didPrepareGLContext: Bool + didPrepareGL: Bool didSetup: Bool isReadyToRender: Bool pixelSize: [Int32] reshapePixelSize: [Int32] + willDeinit: Bool RenderComponent: type: component oneliners: - didClickIncrement: renderLoadCubeModel(RenderVM.shared!) + - didPrepareGL: renderInit(RenderVM.shared!) + - didPrepareGL: RenderVM.shared!.didPrepareGL = true + - didPrepareGL: renderStartTimer(RenderVM.shared!) - pixelSize: RenderVM.shared!.pixelSize = c.pixelSize - - didPrepareGLContext: renderInit(RenderVM.shared!) - - didPrepareGLContext: RenderVM.shared!.didPrepareGLContext = true - - didPrepareGLContext: renderStartTimer(RenderVM.shared!) + - willDeinit: renderDeinit(RenderVM.shared!) shoulds: didLaunch: 1. Only once during the first setup: diff --git a/game/ver-mac/src/dialect.swift b/game/ver-mac/src/dialect.swift index 1bca837..f0d0729 100644 --- a/game/ver-mac/src/dialect.swift +++ b/game/ver-mac/src/dialect.swift @@ -124,22 +124,24 @@ public struct F { public static let countText = "countText" public static let didClickIncrement = "didClickIncrement" public static let didLaunch = "didLaunch" - public static let didPrepareGLContext = "didPrepareGLContext" + public static let didPrepareGL = "didPrepareGL" public static let didSetup = "didSetup" public static let isReadyToRender = "isReadyToRender" public static let pixelSize = "pixelSize" public static let reshapePixelSize = "reshapePixelSize" + public static let willDeinit = "willDeinit" } public struct RenderContext: DialectContext { public var backingPixelSize = [Int32]() public var didClickIncrement = Bool() public var didLaunch = Bool() - public var didPrepareGLContext = Bool() + public var didPrepareGL = Bool() public var didSetup = Bool() public var isReadyToRender = Bool() public var pixelSize = [Int32]() public var reshapePixelSize = [Int32]() + public var willDeinit = Bool() public var recentField = "" @@ -153,8 +155,8 @@ public struct RenderContext: DialectContext { else if (name == "didLaunch") { return didLaunch as! T } - else if (name == "didPrepareGLContext") { - return didPrepareGLContext as! T + else if (name == "didPrepareGL") { + return didPrepareGL as! T } else if (name == "didSetup") { return didSetup as! T @@ -168,6 +170,9 @@ public struct RenderContext: DialectContext { else if (name == "reshapePixelSize") { return reshapePixelSize as! T } + else if (name == "willDeinit") { + return willDeinit as! T + } return "unknown-field-name" as! T } @@ -185,8 +190,8 @@ public struct RenderContext: DialectContext { else if (name == "didLaunch") { didLaunch = value as! Bool } - else if (name == "didPrepareGLContext") { - didPrepareGLContext = value as! Bool + else if (name == "didPrepareGL") { + didPrepareGL = value as! Bool } else if (name == "didSetup") { didSetup = value as! Bool @@ -200,6 +205,9 @@ public struct RenderContext: DialectContext { else if (name == "reshapePixelSize") { reshapePixelSize = value as! [Int32] } + else if (name == "willDeinit") { + willDeinit = value as! Bool + } } } @@ -418,10 +426,11 @@ func rootRegisterShoulds(_ ctrl: DialectController) { func renderRegisterEffects(_ ctrl: DialectController) { let _: RenderContext? = registerOneliners(ctrl, [ F.didClickIncrement, { (c: RenderContext) in renderLoadCubeModel(RenderVM.shared!) }, + F.didPrepareGL, { (c: RenderContext) in renderInit(RenderVM.shared!) }, + F.didPrepareGL, { (c: RenderContext) in RenderVM.shared!.didPrepareGL = true }, + F.didPrepareGL, { (c: RenderContext) in renderStartTimer(RenderVM.shared!) }, F.pixelSize, { (c: RenderContext) in RenderVM.shared!.pixelSize = c.pixelSize }, - F.didPrepareGLContext, { (c: RenderContext) in renderInit(RenderVM.shared!) }, - F.didPrepareGLContext, { (c: RenderContext) in RenderVM.shared!.didPrepareGLContext = true }, - F.didPrepareGLContext, { (c: RenderContext) in renderStartTimer(RenderVM.shared!) }, + F.willDeinit, { (c: RenderContext) in renderDeinit(RenderVM.shared!) }, ]) }