From fab65fb5ad49bc72d6b7608802284fb4b6dc8460 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: Mon, 19 Oct 2026 17:57:54 +0300 Subject: [PATCH] move timer --- components/render/mac/view/RenderGLView.swift | 17 ++++------------- components/render/renderConst.swift | 2 ++ components/render/renderEffect.swift | 11 +++++++++++ dialect.yml | 2 ++ game/ver-mac/src/dialect.swift | 9 +++++++++ game/ver-mac/src/render/renderEffect.swift | 1 + 6 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 components/render/renderEffect.swift create mode 120000 game/ver-mac/src/render/renderEffect.swift diff --git a/components/render/mac/view/RenderGLView.swift b/components/render/mac/view/RenderGLView.swift index 54fc8e1..ebe1055 100644 --- a/components/render/mac/view/RenderGLView.swift +++ b/components/render/mac/view/RenderGLView.swift @@ -4,7 +4,6 @@ import RaylibBridge import SwiftUI final class RenderGLView: NSOpenGLView { - private var renderTimer: Timer? private var ready = false private var startTime: CFTimeInterval = 0 @@ -24,8 +23,8 @@ final class RenderGLView: NSOpenGLView { override func prepareOpenGL() { super.prepareOpenGL() - guard let context = openGLContext else { return } + context.makeCurrentContext() var swapInterval: Int32 = 1 @@ -39,16 +38,7 @@ final class RenderGLView: NSOpenGLView { startTime = CACurrentMediaTime() ready = true - startRenderTimer() - } - - private func startRenderTimer() { - guard renderTimer == nil else { return } - let timer = Timer(timeInterval: 1.0 / 60.0, repeats: true) { [weak self] _ in - self?.needsDisplay = true - } - RunLoop.main.add(timer, forMode: .common) - renderTimer = timer + renderSet(F.willPrepareGLContext, true) } private func loadModel() { @@ -111,7 +101,8 @@ final class RenderGLView: NSOpenGLView { } deinit { - renderTimer?.invalidate() + print("ИГР RenderGV.deinit") + // TODO: renderTimer?.invalidate() openGLContext?.makeCurrentContext() sr_shutdown() } diff --git a/components/render/renderConst.swift b/components/render/renderConst.swift index fd31c4c..248a7a4 100644 --- a/components/render/renderConst.swift +++ b/components/render/renderConst.swift @@ -9,6 +9,8 @@ let RENDER_CONFIG = sr_config( ground_size: 40.0 ) +let RENDER_FPS = 60.0 + let RENDER_OPENGL_ATTRS: [NSOpenGLPixelFormatAttribute] = [ UInt32(NSOpenGLPFAOpenGLProfile), UInt32(NSOpenGLProfileVersion3_2Core), UInt32(NSOpenGLPFAColorSize), 24, diff --git a/components/render/renderEffect.swift b/components/render/renderEffect.swift new file mode 100644 index 0000000..8f9bbe2 --- /dev/null +++ b/components/render/renderEffect.swift @@ -0,0 +1,11 @@ +import Foundation + +func renderStartTimer(_ vm: RenderVM) { + // 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 + RunLoop.main.add(timer, forMode: .common) +} diff --git a/dialect.yml b/dialect.yml index 01baf85..e14708c 100644 --- a/dialect.yml +++ b/dialect.yml @@ -13,12 +13,14 @@ RenderContext: isReadyToRender: Bool pixelSize: [Int32] reshapePixelSize: [Int32] + willPrepareGLContext: Bool RenderComponent: type: component oneliners: - isReadyToRender: print("ИГР isRTR: '\(c.isReadyToRender)'") - pixelSize: RenderVM.shared!.pixelSize = c.pixelSize + - willPrepareGLContext: renderStartTimer(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 12ab592..2437379 100644 --- a/game/ver-mac/src/dialect.swift +++ b/game/ver-mac/src/dialect.swift @@ -128,6 +128,7 @@ public struct F { public static let isReadyToRender = "isReadyToRender" public static let pixelSize = "pixelSize" public static let reshapePixelSize = "reshapePixelSize" + public static let willPrepareGLContext = "willPrepareGLContext" } public struct RenderContext: DialectContext { @@ -137,6 +138,7 @@ public struct RenderContext: DialectContext { public var isReadyToRender = Bool() public var pixelSize = [Int32]() public var reshapePixelSize = [Int32]() + public var willPrepareGLContext = Bool() public var recentField = "" @@ -159,6 +161,9 @@ public struct RenderContext: DialectContext { else if (name == "reshapePixelSize") { return reshapePixelSize as! T } + else if (name == "willPrepareGLContext") { + return willPrepareGLContext as! T + } return "unknown-field-name" as! T } @@ -185,6 +190,9 @@ public struct RenderContext: DialectContext { else if (name == "reshapePixelSize") { reshapePixelSize = value as! [Int32] } + else if (name == "willPrepareGLContext") { + willPrepareGLContext = value as! Bool + } } } @@ -404,6 +412,7 @@ func renderRegisterEffects(_ ctrl: DialectController) { let _: RenderContext? = registerOneliners(ctrl, [ F.isReadyToRender, { (c: RenderContext) in print("ИГР isRTR: '\(c.isReadyToRender)'") }, F.pixelSize, { (c: RenderContext) in RenderVM.shared!.pixelSize = c.pixelSize }, + F.willPrepareGLContext, { (c: RenderContext) in renderStartTimer(RenderVM.shared!) }, ]) } diff --git a/game/ver-mac/src/render/renderEffect.swift b/game/ver-mac/src/render/renderEffect.swift new file mode 120000 index 0000000..d269bb5 --- /dev/null +++ b/game/ver-mac/src/render/renderEffect.swift @@ -0,0 +1 @@ +../../../../components/render/renderEffect.swift \ No newline at end of file