From b00aac50426eb218ecbf06a7bd70177a393311f3 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: Thu, 22 Oct 2026 06:24:11 +0300 Subject: [PATCH 01/12] =?UTF-8?q?=D0=BF=D1=83=D1=81=D1=82=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -- 2.53.0 From 3ae9275dd4b7ef65af1e52e5532cb71afeed082a 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: Thu, 22 Oct 2026 06:39:47 +0300 Subject: [PATCH 02/12] make chkgfx ios stub --- README.md | 4 +++ components/chkgfx/ios/view/ChkgfxView.swift | 1 + .../AppIcon.appiconset/AppIcon.png | Bin 0 -> 64192 bytes .../AppIcon.appiconset/Contents.json | 14 ++++++++++ ogs-chkgfx/ver-ios/Info.plist | 26 ++++++++++++++++++ ogs-chkgfx/ver-ios/project.yml | 14 ++++++++++ ogs-chkgfx/ver-ios/src/AppDelegate.swift | 19 +++++++++++++ ogs-chkgfx/ver-ios/src/ChkgfxApp.swift | 12 ++++++++ ogs-chkgfx/ver-ios/src/chkgfx/chkgfx.swift | 1 + ogs-chkgfx/ver-ios/src/chkgfx/chkgfxVM.swift | 1 + .../ver-ios/src/chkgfx/view/ChkgfxView.swift | 1 + ogs-chkgfx/ver-ios/src/dialect.swift | 1 + ogs-chkgfx/ver-ios/src/other/other.swift | 1 + ogs-chkgfx/ver-mac/src/ChkgfxApp.swift | 1 - .../src/{GameApp.swift => MahjongApp.swift} | 3 +- 15 files changed, 96 insertions(+), 3 deletions(-) create mode 120000 components/chkgfx/ios/view/ChkgfxView.swift create mode 100644 ogs-chkgfx/ver-ios/Assets.xcassets/AppIcon.appiconset/AppIcon.png create mode 100644 ogs-chkgfx/ver-ios/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 ogs-chkgfx/ver-ios/Info.plist create mode 100644 ogs-chkgfx/ver-ios/project.yml create mode 100644 ogs-chkgfx/ver-ios/src/AppDelegate.swift create mode 100644 ogs-chkgfx/ver-ios/src/ChkgfxApp.swift create mode 120000 ogs-chkgfx/ver-ios/src/chkgfx/chkgfx.swift create mode 120000 ogs-chkgfx/ver-ios/src/chkgfx/chkgfxVM.swift create mode 120000 ogs-chkgfx/ver-ios/src/chkgfx/view/ChkgfxView.swift create mode 120000 ogs-chkgfx/ver-ios/src/dialect.swift create mode 120000 ogs-chkgfx/ver-ios/src/other/other.swift rename ogs-mahjong/ver-mac/src/{GameApp.swift => MahjongApp.swift} (90%) diff --git a/README.md b/README.md index e528e84..6db0e2d 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,7 @@ * macOS `brew install raylib` + +* iOS + + `brew install xcodegen` diff --git a/components/chkgfx/ios/view/ChkgfxView.swift b/components/chkgfx/ios/view/ChkgfxView.swift new file mode 120000 index 0000000..3a1e13d --- /dev/null +++ b/components/chkgfx/ios/view/ChkgfxView.swift @@ -0,0 +1 @@ +../../mac/view/ChkgfxView.swift \ No newline at end of file diff --git a/ogs-chkgfx/ver-ios/Assets.xcassets/AppIcon.appiconset/AppIcon.png b/ogs-chkgfx/ver-ios/Assets.xcassets/AppIcon.appiconset/AppIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..f2520ea25b9b9c5be9ee0feb38f8d8692477ce82 GIT binary patch literal 64192 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 + + + + CFBundleName + OGS chkgfx + CFBundleDisplayName + OGS chkgfx + CFBundleIdentifier + org.opengamestudio.chkgfx + CFBundleExecutable + ogs-chkgfx + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + UILaunchScreen + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + + + diff --git a/ogs-chkgfx/ver-ios/project.yml b/ogs-chkgfx/ver-ios/project.yml new file mode 100644 index 0000000..bddd15f --- /dev/null +++ b/ogs-chkgfx/ver-ios/project.yml @@ -0,0 +1,14 @@ +name: OGS chkgfx +options: + bundleIdPrefix: org.opengamestudio +targets: + ogs-chkgfx: + type: application + platform: iOS + deploymentTarget: "15.0" + sources: + - path: Assets.xcassets + - path: src + settings: + base: + INFOPLIST_FILE: Info.plist diff --git a/ogs-chkgfx/ver-ios/src/AppDelegate.swift b/ogs-chkgfx/ver-ios/src/AppDelegate.swift new file mode 100644 index 0000000..5f14539 --- /dev/null +++ b/ogs-chkgfx/ver-ios/src/AppDelegate.swift @@ -0,0 +1,19 @@ +import UIKit + +final class AppDelegate: + NSObject, + UIApplicationDelegate +{ + let chkgfx = ChkgfxComponent() + let chkgfxVM = ChkgfxVM() + + func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil + ) -> Bool { + otherSetupConsoleLogging(chkgfx.ctrl, "Chkgfx") + chkgfx.setup() + + return true + } +} diff --git a/ogs-chkgfx/ver-ios/src/ChkgfxApp.swift b/ogs-chkgfx/ver-ios/src/ChkgfxApp.swift new file mode 100644 index 0000000..7aa819c --- /dev/null +++ b/ogs-chkgfx/ver-ios/src/ChkgfxApp.swift @@ -0,0 +1,12 @@ +import SwiftUI + +@main +struct ChkgfxApp: App { + @UIApplicationDelegateAdaptor(AppDelegate.self) private var appDelegate + + var body: some Scene { + WindowGroup { + ChkgfxView(appDelegate.chkgfxVM) + } + } +} diff --git a/ogs-chkgfx/ver-ios/src/chkgfx/chkgfx.swift b/ogs-chkgfx/ver-ios/src/chkgfx/chkgfx.swift new file mode 120000 index 0000000..3c6bb5e --- /dev/null +++ b/ogs-chkgfx/ver-ios/src/chkgfx/chkgfx.swift @@ -0,0 +1 @@ +../../../../components/chkgfx/chkgfx.swift \ No newline at end of file diff --git a/ogs-chkgfx/ver-ios/src/chkgfx/chkgfxVM.swift b/ogs-chkgfx/ver-ios/src/chkgfx/chkgfxVM.swift new file mode 120000 index 0000000..cf74ca4 --- /dev/null +++ b/ogs-chkgfx/ver-ios/src/chkgfx/chkgfxVM.swift @@ -0,0 +1 @@ +../../../../components/chkgfx/chkgfxVM.swift \ No newline at end of file diff --git a/ogs-chkgfx/ver-ios/src/chkgfx/view/ChkgfxView.swift b/ogs-chkgfx/ver-ios/src/chkgfx/view/ChkgfxView.swift new file mode 120000 index 0000000..6c25613 --- /dev/null +++ b/ogs-chkgfx/ver-ios/src/chkgfx/view/ChkgfxView.swift @@ -0,0 +1 @@ +../../../../../components/chkgfx/ios/view/ChkgfxView.swift \ No newline at end of file diff --git a/ogs-chkgfx/ver-ios/src/dialect.swift b/ogs-chkgfx/ver-ios/src/dialect.swift new file mode 120000 index 0000000..a931c95 --- /dev/null +++ b/ogs-chkgfx/ver-ios/src/dialect.swift @@ -0,0 +1 @@ +../../ver-mac/src/dialect.swift \ No newline at end of file diff --git a/ogs-chkgfx/ver-ios/src/other/other.swift b/ogs-chkgfx/ver-ios/src/other/other.swift new file mode 120000 index 0000000..f91488c --- /dev/null +++ b/ogs-chkgfx/ver-ios/src/other/other.swift @@ -0,0 +1 @@ +../../../../components/other/other.swift \ No newline at end of file diff --git a/ogs-chkgfx/ver-mac/src/ChkgfxApp.swift b/ogs-chkgfx/ver-mac/src/ChkgfxApp.swift index 105f2dc..090c94b 100644 --- a/ogs-chkgfx/ver-mac/src/ChkgfxApp.swift +++ b/ogs-chkgfx/ver-mac/src/ChkgfxApp.swift @@ -1,4 +1,3 @@ -import AppKit import SwiftUI @main diff --git a/ogs-mahjong/ver-mac/src/GameApp.swift b/ogs-mahjong/ver-mac/src/MahjongApp.swift similarity index 90% rename from ogs-mahjong/ver-mac/src/GameApp.swift rename to ogs-mahjong/ver-mac/src/MahjongApp.swift index 449a921..3d71dfe 100644 --- a/ogs-mahjong/ver-mac/src/GameApp.swift +++ b/ogs-mahjong/ver-mac/src/MahjongApp.swift @@ -1,8 +1,7 @@ -import AppKit import SwiftUI @main -struct GameApp: App { +struct MahjongApp: App { @NSApplicationDelegateAdaptor(AppDelegate.self) private var appDelegate var body: some Scene { -- 2.53.0 From 7a0a09c2a1e891018326f88ec4775f1418e3f244 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: Thu, 22 Oct 2026 06:43:31 +0300 Subject: [PATCH 03/12] prep --- util/prepare-ogs-chkgfx-ios | 11 +++++++++++ util/step/prepareIOS | 9 +++++++++ 2 files changed, 20 insertions(+) create mode 100755 util/prepare-ogs-chkgfx-ios create mode 100755 util/step/prepareIOS diff --git a/util/prepare-ogs-chkgfx-ios b/util/prepare-ogs-chkgfx-ios new file mode 100755 index 0000000..80c6be5 --- /dev/null +++ b/util/prepare-ogs-chkgfx-ios @@ -0,0 +1,11 @@ +#!/bin/bash -e +SDIR=$(cd "$(dirname "$0")" ; pwd -P) + +T=$SDIR/step +source $SDIR/paths + +TARGET=ogs-chkgfx + +STEP=0 +source $T/generateDialect $TARGET +source $T/prepareIOS $TARGET diff --git a/util/step/prepareIOS b/util/step/prepareIOS new file mode 100755 index 0000000..b1c2e08 --- /dev/null +++ b/util/step/prepareIOS @@ -0,0 +1,9 @@ +#!/bin/bash -e + +TARGET=$1 + +STEP=$((STEP+1)) +echo -e "\n> > > > Step №$STEP. Generate iOS project for '$TARGET'" + +cd $SDIR/../$TARGET/ver-ios +xcodegen -- 2.53.0 From 6fecc1e95e99c93665530d7c80e0aee5d4fd18d4 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: Thu, 22 Oct 2026 17:32:19 +0300 Subject: [PATCH 04/12] =?UTF-8?q?=D0=BF=D1=83=D1=81=D1=82=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ogs-chkgfx/dialect.yml | 45 -------- ogs-chkgfx/ver-mac/src/dialect.swift | 153 --------------------------- 2 files changed, 198 deletions(-) diff --git a/ogs-chkgfx/dialect.yml b/ogs-chkgfx/dialect.yml index 074422f..ac44a8a 100644 --- a/ogs-chkgfx/dialect.yml +++ b/ogs-chkgfx/dialect.yml @@ -20,48 +20,3 @@ ChkgfxContext: fields: didLaunch: Bool didSetup: Bool - -RenderContext: - type: context - fields: - backingPixelSize: [Int32] - didLaunch: Bool - didPrepareGL: Bool - didSetup: Bool - pixelSize: [Int32] - reshapePixelSize: [Int32] - willDeinit: Bool - -RenderComponent: - type: component - oneliners: - - didPrepareGL: renderInit(RenderVM.shared!) - - didPrepareGL: RenderVM.shared!.didPrepareGL = true - - didPrepareGL: renderStartTimer(RenderVM.shared!) - - didPrepareGL: renderLoadCubeModel(RenderVM.shared!) - - pixelSize: RenderVM.shared!.pixelSize = c.pixelSize - - willDeinit: renderDeinit(RenderVM.shared!) - shoulds: - didLaunch: - 1. Only once during the first setup: - if: - c.recentField == F.didSetup && - c.didLaunch == false - then: - c.didLaunch = true - pixelSize: - 1. Upon launch: - if: - c.recentField == F.didLaunch - then: - c.pixelSize = [1, 1] - 2. Upon resize: - if: - c.recentField == F.reshapePixelSize - then: - c.pixelSize = c.reshapePixelSize - 3. Upon DPI change: - if: - c.recentField == F.backingPixelSize - then: - c.pixelSize = c.backingPixelSize diff --git a/ogs-chkgfx/ver-mac/src/dialect.swift b/ogs-chkgfx/ver-mac/src/dialect.swift index db74862..8b3bd0a 100644 --- a/ogs-chkgfx/ver-mac/src/dialect.swift +++ b/ogs-chkgfx/ver-mac/src/dialect.swift @@ -119,13 +119,8 @@ func registerOneliners( // Context field names for static type check public struct F { - public static let backingPixelSize = "backingPixelSize" public static let didLaunch = "didLaunch" - public static let didPrepareGL = "didPrepareGL" public static let didSetup = "didSetup" - public static let pixelSize = "pixelSize" - public static let reshapePixelSize = "reshapePixelSize" - public static let willDeinit = "willDeinit" } public struct ChkgfxContext: DialectContext { @@ -159,72 +154,6 @@ public struct ChkgfxContext: DialectContext { } } -public struct RenderContext: DialectContext { - public var backingPixelSize = [Int32]() - public var didLaunch = Bool() - public var didPrepareGL = Bool() - public var didSetup = Bool() - public var pixelSize = [Int32]() - public var reshapePixelSize = [Int32]() - public var willDeinit = Bool() - - public var recentField = "" - - public func field(_ name: String) -> T { - if (name == "backingPixelSize") { - return backingPixelSize as! T - } - else if (name == "didLaunch") { - return didLaunch as! T - } - else if (name == "didPrepareGL") { - return didPrepareGL as! T - } - else if (name == "didSetup") { - return didSetup as! T - } - else if (name == "pixelSize") { - return pixelSize as! T - } - else if (name == "reshapePixelSize") { - return reshapePixelSize as! T - } - else if (name == "willDeinit") { - return willDeinit as! T - } - - return "unknown-field-name" as! T - } - - public mutating func setField( - _ name: String, - _ value: Any - ) { - if (name == "backingPixelSize") { - backingPixelSize = value as! [Int32] - } - else if (name == "didLaunch") { - didLaunch = value as! Bool - } - else if (name == "didPrepareGL") { - didPrepareGL = value as! Bool - } - else if (name == "didSetup") { - didSetup = value as! Bool - } - else if (name == "pixelSize") { - pixelSize = value as! [Int32] - } - else if (name == "reshapePixelSize") { - reshapePixelSize = value as! [Int32] - } - else if (name == "willDeinit") { - willDeinit = value as! Bool - } - - } -} - public func chkgfxSet( _ key: String, _ value: Any @@ -232,13 +161,6 @@ public func chkgfxSet( ChkgfxComponent.singleton!.ctrl.set(key, value) } -public func renderSet( - _ key: String, - _ value: Any -) { - RenderComponent.singleton!.ctrl.set(key, value) -} - func chkgfxShouldResetDidLaunch(_ c: ChkgfxContext) -> ChkgfxContext { var c = c @@ -257,59 +179,6 @@ func chkgfxShouldResetDidLaunch(_ c: ChkgfxContext) -> ChkgfxContext { return c } -func renderShouldResetDidLaunch(_ c: RenderContext) -> RenderContext { - var c = c - - /* 1. Only once during the first setup */ - if - c.recentField == F.didSetup && - c.didLaunch == false - { - c.didLaunch = true - c.recentField = F.didLaunch - return c - } - - - c.recentField = DIALECT_CONTEXT_RECENT_FIELD_NONE - return c -} - -func renderShouldResetPixelSize(_ c: RenderContext) -> RenderContext { - var c = c - - /* 1. Upon launch */ - if - c.recentField == F.didLaunch - { - c.pixelSize = [1, 1] - c.recentField = F.pixelSize - return c - } - - /* 2. Upon resize */ - if - c.recentField == F.reshapePixelSize - { - c.pixelSize = c.reshapePixelSize - c.recentField = F.pixelSize - return c - } - - /* 3. Upon DPI change */ - if - c.recentField == F.backingPixelSize - { - c.pixelSize = c.backingPixelSize - c.recentField = F.pixelSize - return c - } - - - c.recentField = DIALECT_CONTEXT_RECENT_FIELD_NONE - return c -} - func chkgfxRegisterShoulds(_ ctrl: DialectController) { [ chkgfxShouldResetDidLaunch, @@ -318,25 +187,3 @@ func chkgfxRegisterShoulds(_ ctrl: DialectController) { ctrl.registerFunction { c in f(c as! ChkgfxContext) } } } - -func renderRegisterShoulds(_ ctrl: DialectController) { - [ - renderShouldResetDidLaunch, - renderShouldResetPixelSize, - - ].forEach { f in - ctrl.registerFunction { c in f(c as! RenderContext) } - } -} - -func renderRegisterEffects(_ ctrl: DialectController) { - let _: RenderContext? = registerOneliners(ctrl, [ - 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.didPrepareGL, { (c: RenderContext) in renderLoadCubeModel(RenderVM.shared!) }, - F.pixelSize, { (c: RenderContext) in RenderVM.shared!.pixelSize = c.pixelSize }, - F.willDeinit, { (c: RenderContext) in renderDeinit(RenderVM.shared!) }, - - ]) -} -- 2.53.0 From fa1cd053c87e8ee3719945a734abdc70b77ac7c2 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: Thu, 22 Oct 2026 18:33:09 +0300 Subject: [PATCH 05/12] try my way --- .gitignore | 1 + .../raybri/ios/RaybriIOS-Bridging-Header.h | 6 + components/raybri/ios/raybriIOS.h | 28 +++ components/raybri/ios/raybriIOS.mm | 236 ++++++++++++++++++ components/render/ios/RenderGLView.swift | 60 +++++ components/render/ios/RenderVM.swift | 16 ++ components/render/ios/RenderView.swift | 11 + components/render/ios/renderAux.swift | 17 ++ components/render/ios/renderConst.swift | 3 + components/render/ios/renderEffect.swift | 35 +++ ogs-chkgfx/ver-ios/project.yml | 23 +- ogs-chkgfx/ver-ios/src/AppDelegate.swift | 1 + ogs-chkgfx/ver-ios/src/ChkgfxApp.swift | 6 +- util/build-ogs-chkgfx-ios | 14 ++ util/run-ogs-chkgfx-ios | 26 ++ util/step/prepareIOS | 40 +++ 16 files changed, 521 insertions(+), 2 deletions(-) create mode 100644 components/raybri/ios/RaybriIOS-Bridging-Header.h create mode 100644 components/raybri/ios/raybriIOS.h create mode 100644 components/raybri/ios/raybriIOS.mm create mode 100644 components/render/ios/RenderGLView.swift create mode 100644 components/render/ios/RenderVM.swift create mode 100644 components/render/ios/RenderView.swift create mode 100644 components/render/ios/renderAux.swift create mode 100644 components/render/ios/renderConst.swift create mode 100644 components/render/ios/renderEffect.swift create mode 100755 util/build-ogs-chkgfx-ios create mode 100755 util/run-ogs-chkgfx-ios diff --git a/.gitignore b/.gitignore index 162f817..f46601f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ gradle-daemon-jvm.properties local.properties Package.resolved *.xcodeproj +Frameworks diff --git a/components/raybri/ios/RaybriIOS-Bridging-Header.h b/components/raybri/ios/RaybriIOS-Bridging-Header.h new file mode 100644 index 0000000..dc8f953 --- /dev/null +++ b/components/raybri/ios/RaybriIOS-Bridging-Header.h @@ -0,0 +1,6 @@ +#ifndef OGS_MAHJONG_RAYLIB_IOS_BRIDGING_HEADER_H +#define OGS_MAHJONG_RAYLIB_IOS_BRIDGING_HEADER_H + +#import "raybriIOS.h" + +#endif diff --git a/components/raybri/ios/raybriIOS.h b/components/raybri/ios/raybriIOS.h new file mode 100644 index 0000000..f5226da --- /dev/null +++ b/components/raybri/ios/raybriIOS.h @@ -0,0 +1,28 @@ +#ifndef OGS_MAHJONG_RAYLIB_IOS_BRIDGE_H +#define OGS_MAHJONG_RAYLIB_IOS_BRIDGE_H + +#ifdef __cplusplus +extern "C" { +#endif + +// Initialise EGL (ANGLE) on the given CALayer and bring up raylib's rlgl. +// Unlike the ghera/raylib-iOS backend, no raylib window, view controller or +// app delegate is involved: the caller owns the layer and the frame timer. +// Returns 1 on success, 0 on failure. +int raybri_ios_init(void *layer, int width, int height); + +// Recreate the EGL window surface for a new drawable size (backing pixels). +void raybri_ios_resize(int width, int height); + +// Render one frame: clear the drawable to a time-based background colour and +// present it. `time` is monotonically increasing seconds. +void raybri_ios_render(double time); + +// Release rlgl state and the EGL surface/context/display. +void raybri_ios_shutdown(void); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/components/raybri/ios/raybriIOS.mm b/components/raybri/ios/raybriIOS.mm new file mode 100644 index 0000000..c40fd91 --- /dev/null +++ b/components/raybri/ios/raybriIOS.mm @@ -0,0 +1,236 @@ +// iOS counterpart of raybri.c. +// +// The prebuilt ghera/raylib-iOS xcframework is callback-driven: its rcore_ios.c +// defines main(), AppDelegate, SceneDelegate and GameViewController, so linking +// it would hand the whole app to raylib (and clash with SwiftUI's own main()). +// Instead this bridge compiles raylib's renderer (rlgl) directly and owns only +// the GL side. The view and the frame timer stay in ver-ios, exactly like the +// macOS build where RenderVM drives the NSOpenGLView. +// +// GL runs on ANGLE (libEGL + libGLESv2, Metal backend), taken from the same +// ghera release as raylib's headers. + +#import + +#include "raybriIOS.h" + +#include +#include + +#include + +// rlgl's iOS branch includes before gl2/gl3, so the +// GL_API/GL_APIENTRY macros have to come from glplatform.h first. ghera's +// build script does this with -include; we do it explicitly. +#include + +#define RLGL_IMPLEMENTATION +#include + +static EGLDisplay sr_display = EGL_NO_DISPLAY; +static EGLSurface sr_surface = EGL_NO_SURFACE; +static EGLContext sr_context = EGL_NO_CONTEXT; +static EGLConfig sr_config = NULL; +static void *sr_layer = NULL; + +static int sr_ready = 0; +static int sr_width = 1; +static int sr_height = 1; + +static void sr_log(const char *text) +{ + fprintf(stderr, "RBIOS: %s\n", text); + fflush(stderr); +} + +static void sr_hsv_to_rgb(float h, float s, float v, float *r, float *g, float *b) +{ + float i = floorf(h * 6.0f); + float f = h * 6.0f - i; + float p = v * (1.0f - s); + float q = v * (1.0f - f * s); + float t = v * (1.0f - (1.0f - f) * s); + + switch (((int)i) % 6) + { + case 0: *r = v; *g = t; *b = p; break; + case 1: *r = q; *g = v; *b = p; break; + case 2: *r = p; *g = v; *b = t; break; + case 3: *r = p; *g = q; *b = v; break; + case 4: *r = t; *g = p; *b = v; break; + default: *r = v; *g = p; *b = q; break; + } +} + +// (Re)create the EGL window surface on the layer handed to us by UIKit. +static int sr_create_surface(void) +{ + if (sr_surface != EGL_NO_SURFACE) + { + eglDestroySurface(sr_display, sr_surface); + sr_surface = EGL_NO_SURFACE; + } + + // ANGLE on iOS takes a CALayer as the native window. + sr_surface = eglCreateWindowSurface(sr_display, sr_config, (EGLNativeWindowType)sr_layer, NULL); + if (sr_surface == EGL_NO_SURFACE) + { + sr_log("failed to create EGL window surface"); + return 0; + } + + if (eglMakeCurrent(sr_display, sr_surface, sr_surface, sr_context) == EGL_FALSE) + { + sr_log("failed to make the EGL context current"); + return 0; + } + + rlViewport(0, 0, sr_width, sr_height); + rlSetFramebufferWidth(sr_width); + rlSetFramebufferHeight(sr_height); + + return 1; +} + +int raybri_ios_init(void *layer, int width, int height) +{ + if (sr_ready) return 1; + + if (layer == NULL) + { + sr_log("no drawable layer"); + return 0; + } + + sr_layer = layer; + sr_width = (width > 0) ? width : 1; + sr_height = (height > 0) ? height : 1; + + sr_display = eglGetDisplay(EGL_DEFAULT_DISPLAY); + if (sr_display == EGL_NO_DISPLAY) + { + sr_log("failed to get the EGL display"); + return 0; + } + + if (eglInitialize(sr_display, NULL, NULL) == EGL_FALSE) + { + sr_log("failed to initialize EGL"); + return 0; + } + + if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE) + { + sr_log("failed to bind the OpenGL ES API"); + return 0; + } + + const EGLint config_attribs[] = { + EGL_RENDERABLE_TYPE, EGL_OPENGL_ES3_BIT, + EGL_SURFACE_TYPE, EGL_WINDOW_BIT, + EGL_RED_SIZE, 8, + EGL_GREEN_SIZE, 8, + EGL_BLUE_SIZE, 8, + EGL_ALPHA_SIZE, 8, + EGL_DEPTH_SIZE, 16, + EGL_NONE + }; + + EGLint config_count = 0; + if (eglChooseConfig(sr_display, config_attribs, &sr_config, 1, &config_count) == EGL_FALSE || config_count < 1) + { + sr_log("failed to choose an EGL config"); + return 0; + } + + const EGLint context_attribs[] = { + EGL_CONTEXT_CLIENT_VERSION, 3, + EGL_NONE + }; + + sr_context = eglCreateContext(sr_display, sr_config, EGL_NO_CONTEXT, context_attribs); + if (sr_context == EGL_NO_CONTEXT) + { + sr_log("failed to create an EGL context"); + return 0; + } + + if (!sr_create_surface()) return 0; + + // With GL_GLEXT_PROTOTYPES rlgl calls the ANGLE entry points directly, but + // the call keeps parity with the platform backends and is harmless. + rlLoadExtensions((void *)eglGetProcAddress); + rlglInit(sr_width, sr_height); + + sr_log("EGL/ANGLE + rlgl initialized"); + sr_ready = 1; + + return 1; +} + +void raybri_ios_resize(int width, int height) +{ + if (!sr_ready) return; + + if (width <= 0 || height <= 0) return; + if (width == sr_width && height == sr_height) return; + + sr_width = width; + sr_height = height; + + if (!sr_create_surface()) return; + + sr_log("surface recreated"); +} + +void raybri_ios_render(double time) +{ + if (!sr_ready) return; + + if (eglMakeCurrent(sr_display, sr_surface, sr_surface, sr_context) == EGL_FALSE) return; + + // Background colour cycles through the hue wheel over time. + float hue = fmodf((float)time * 0.15f, 1.0f); + float r = 0.0f; + float g = 0.0f; + float b = 0.0f; + sr_hsv_to_rgb(hue, 0.65f, 0.85f, &r, &g, &b); + + rlClearColor((unsigned char)(r * 255.0f), (unsigned char)(g * 255.0f), (unsigned char)(b * 255.0f), 255); + rlClearScreenBuffers(); + + eglSwapBuffers(sr_display, sr_surface); +} + +void raybri_ios_shutdown(void) +{ + if (!sr_ready) return; + + eglMakeCurrent(sr_display, sr_surface, sr_surface, sr_context); + rlglClose(); + + eglMakeCurrent(sr_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); + + if (sr_surface != EGL_NO_SURFACE) + { + eglDestroySurface(sr_display, sr_surface); + sr_surface = EGL_NO_SURFACE; + } + + if (sr_context != EGL_NO_CONTEXT) + { + eglDestroyContext(sr_display, sr_context); + sr_context = EGL_NO_CONTEXT; + } + + if (sr_display != EGL_NO_DISPLAY) + { + eglTerminate(sr_display); + sr_display = EGL_NO_DISPLAY; + } + + sr_layer = NULL; + sr_ready = 0; + + sr_log("shutdown"); +} diff --git a/components/render/ios/RenderGLView.swift b/components/render/ios/RenderGLView.swift new file mode 100644 index 0000000..b169770 --- /dev/null +++ b/components/render/ios/RenderGLView.swift @@ -0,0 +1,60 @@ +import UIKit + +// UIView counterpart of the macOS RenderGLView. UIKit never draws into it: the +// EGL/ANGLE surface renders directly into this view's layer, and the timer in +// RenderVM presents a new frame. The view only reports when it gains a window +// and when its backing size changes. +final class RenderGLView: UIView { + private weak var renderVM: RenderVM? + private var didInit = false + private var lastPixelSize: [Int32] = [0, 0] + + override init(frame: CGRect) { + super.init(frame: frame) + + isOpaque = true + // Touch handling is not wired to raylib yet, so keep the GL view + // transparent to the SwiftUI hierarchy above it. + isUserInteractionEnabled = false + + contentScaleFactor = UIScreen.main.scale + layer.contentsScale = contentScaleFactor + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + override func didMoveToWindow() { + super.didMoveToWindow() + + guard let window else { return } + contentScaleFactor = window.screen.nativeScale + layer.contentsScale = contentScaleFactor + + guard !didInit, let vm = RenderVM.shared else { return } + guard renderInit(vm) else { return } + + renderVM = vm + didInit = true + lastPixelSize = renderPixelSize(self) + renderStartTimer(vm) + } + + override func layoutSubviews() { + super.layoutSubviews() + + guard didInit else { return } + + let size = renderPixelSize(self) + guard size != lastPixelSize else { return } + + lastPixelSize = size + raybri_ios_resize(size[0], size[1]) + } + + deinit { + guard didInit, let vm = renderVM else { return } + renderDeinit(vm) + } +} diff --git a/components/render/ios/RenderVM.swift b/components/render/ios/RenderVM.swift new file mode 100644 index 0000000..3a21125 --- /dev/null +++ b/components/render/ios/RenderVM.swift @@ -0,0 +1,16 @@ +import Combine +import Foundation + +// iOS counterpart of the macOS RenderVM: it owns the view raylib draws into +// and the timer that drives it. The actual rendering lives in raybriIOS.mm. +final class RenderVM: ObservableObject { + static private(set) weak var shared: RenderVM? + + let glView = RenderGLView(frame: .zero) + var startTime: CFTimeInterval = 0 + var timer: Timer? + + init() { + Self.shared = self + } +} diff --git a/components/render/ios/RenderView.swift b/components/render/ios/RenderView.swift new file mode 100644 index 0000000..0d0d4e0 --- /dev/null +++ b/components/render/ios/RenderView.swift @@ -0,0 +1,11 @@ +import SwiftUI + +// SwiftUI counterpart of the macOS RenderView. It vends the shared GL view, +// which RenderVM also keeps alive and drives with a timer. +struct RenderView: UIViewRepresentable { + func makeUIView(context: Context) -> RenderGLView { + RenderVM.shared!.glView + } + + func updateUIView(_ uiView: RenderGLView, context: Context) {} +} diff --git a/components/render/ios/renderAux.swift b/components/render/ios/renderAux.swift new file mode 100644 index 0000000..9fc07cb --- /dev/null +++ b/components/render/ios/renderAux.swift @@ -0,0 +1,17 @@ +import QuartzCore +import UIKit + +// Render a single frame. The timer calls this directly: an EGL/ANGLE surface +// presents into the view's layer, so there is no draw(_:) / needsDisplay pass +// like in the NSOpenGLView on macOS. +func renderDraw(_ vm: RenderVM) { + raybri_ios_render(CACurrentMediaTime() - vm.startTime) +} + +// Backing-pixel size of the view, which is what EGL/ANGLE renders into. +func renderPixelSize(_ view: UIView) -> [Int32] { + let scale = view.contentScaleFactor + let w = Int32(max(1, (view.bounds.width * scale).rounded())) + let h = Int32(max(1, (view.bounds.height * scale).rounded())) + return [w, h] +} diff --git a/components/render/ios/renderConst.swift b/components/render/ios/renderConst.swift new file mode 100644 index 0000000..11f8268 --- /dev/null +++ b/components/render/ios/renderConst.swift @@ -0,0 +1,3 @@ +// iOS render constants. The macOS renderConst.swift depends on AppKit and the +// RaylibBridge SPM module, 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 new file mode 100644 index 0000000..2de4e51 --- /dev/null +++ b/components/render/ios/renderEffect.swift @@ -0,0 +1,35 @@ +import Foundation +import QuartzCore +import UIKit + +// Bring up EGL/ANGLE on the view's layer. Returns false when the surface could +// not be created (the caller then leaves the timer stopped). +func renderInit(_ vm: RenderVM) -> Bool { + let size = renderPixelSize(vm.glView) + let layer = Unmanaged.passUnretained(vm.glView.layer).toOpaque() + let ok = raybri_ios_init(layer, size[0], size[1]) != 0 + if !ok { + otherPrintStderr("ИГР renderInit: EGL/ANGLE initialization failed") + } + return ok +} + +// Same shape as the macOS timer: a repeating timer on the main run loop, but +// here it calls the renderer directly instead of flagging the view for redraw. +func renderStartTimer(_ vm: RenderVM) { + vm.startTime = CACurrentMediaTime() + + let timer = Timer(timeInterval: 1.0 / RENDER_FPS, repeats: true) { [weak vm] _ in + guard let vm else { return } + renderDraw(vm) + } + vm.timer = timer + // .common keeps rendering alive while the user holds a control. + RunLoop.main.add(timer, forMode: .common) +} + +func renderDeinit(_ vm: RenderVM) { + vm.timer?.invalidate() + vm.timer = nil + raybri_ios_shutdown() +} diff --git a/ogs-chkgfx/ver-ios/project.yml b/ogs-chkgfx/ver-ios/project.yml index bddd15f..f90f1e1 100644 --- a/ogs-chkgfx/ver-ios/project.yml +++ b/ogs-chkgfx/ver-ios/project.yml @@ -5,10 +5,31 @@ targets: ogs-chkgfx: type: application platform: iOS - deploymentTarget: "15.0" + deploymentTarget: "15.6" sources: - path: Assets.xcassets - path: src + - path: ../../components/render/ios + - path: ../../components/raybri/ios + dependencies: + - framework: Frameworks/libEGL.xcframework + embed: true + - framework: Frameworks/libGLESv2.xcframework + embed: true settings: base: INFOPLIST_FILE: Info.plist + PRODUCT_BUNDLE_IDENTIFIER: org.opengamestudio.chkgfx + SWIFT_OBJC_BRIDGING_HEADER: ../../components/raybri/ios/RaybriIOS-Bridging-Header.h + HEADER_SEARCH_PATHS: + - "$(SRCROOT)/../../components/raybri/ios" + - "$(SRCROOT)/../../components/render/ios" + - "$(SRCROOT)/Frameworks/include" + - "$(SRCROOT)/Frameworks/raylib.xcframework/ios-arm64_x86_64-simulator/raylib.framework/Headers" + - "$(SRCROOT)/Frameworks/raylib.xcframework/ios-arm64/raylib.framework/Headers" + GCC_PREPROCESSOR_DEFINITIONS: + - PLATFORM_IOS=1 + - GRAPHICS_API_OPENGL_ES3=1 + - GL_GLEXT_PROTOTYPES=1 + LD_RUNPATH_SEARCH_PATHS: + - "$(inherited) @executable_path/Frameworks" diff --git a/ogs-chkgfx/ver-ios/src/AppDelegate.swift b/ogs-chkgfx/ver-ios/src/AppDelegate.swift index 5f14539..5ae97d0 100644 --- a/ogs-chkgfx/ver-ios/src/AppDelegate.swift +++ b/ogs-chkgfx/ver-ios/src/AppDelegate.swift @@ -6,6 +6,7 @@ final class AppDelegate: { let chkgfx = ChkgfxComponent() let chkgfxVM = ChkgfxVM() + let renderVM = RenderVM() func application( _ application: UIApplication, diff --git a/ogs-chkgfx/ver-ios/src/ChkgfxApp.swift b/ogs-chkgfx/ver-ios/src/ChkgfxApp.swift index 7aa819c..cf20ef5 100644 --- a/ogs-chkgfx/ver-ios/src/ChkgfxApp.swift +++ b/ogs-chkgfx/ver-ios/src/ChkgfxApp.swift @@ -6,7 +6,11 @@ struct ChkgfxApp: App { var body: some Scene { WindowGroup { - ChkgfxView(appDelegate.chkgfxVM) + ZStack { + RenderView() + .ignoresSafeArea() + ChkgfxView(appDelegate.chkgfxVM) + } } } } diff --git a/util/build-ogs-chkgfx-ios b/util/build-ogs-chkgfx-ios new file mode 100755 index 0000000..e8f26c1 --- /dev/null +++ b/util/build-ogs-chkgfx-ios @@ -0,0 +1,14 @@ +#!/bin/bash -e +SDIR=$(cd "$(dirname "$0")" ; pwd -P) + +T=$SDIR/step +source $SDIR/paths + +TARGET=ogs-chkgfx + +STEP=0 +source $T/generateDialect $TARGET +source $T/prepareIOS $TARGET + +cd $SDIR/../$TARGET/ver-ios +xcodebuild -scheme "ogs-chkgfx" -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' -derivedDataPath .build build diff --git a/util/run-ogs-chkgfx-ios b/util/run-ogs-chkgfx-ios new file mode 100755 index 0000000..d0ba3fd --- /dev/null +++ b/util/run-ogs-chkgfx-ios @@ -0,0 +1,26 @@ +#!/bin/bash -e +SDIR=$(cd "$(dirname "$0")" ; pwd -P) + +T=$SDIR/step +source $SDIR/paths + +TARGET=ogs-chkgfx +BUNDLE_ID=org.opengamestudio.chkgfx +APP="$SDIR/../$TARGET/ver-ios/.build/Build/Products/Debug-iphonesimulator/ogs-chkgfx.app" + +if [[ ! -d "$APP" ]]; then + echo "iOS app not built yet, run util/build-ogs-chkgfx-ios" + exit 1 +fi + +DEVICE=${DEVICE:-"iPhone 15 Pro"} +UDID=$(xcrun simctl list devices available | grep -m1 "$DEVICE (" | sed -E 's/.*\(([0-9A-F-]{36})\).*/\1/') +if [[ -z "$UDID" ]]; then + echo "Simulator '$DEVICE' not found" + exit 1 +fi + +xcrun simctl boot "$UDID" 2>/dev/null || true +sleep 2 +xcrun simctl install "$UDID" "$APP" +xcrun simctl launch "$UDID" "$BUNDLE_ID" diff --git a/util/step/prepareIOS b/util/step/prepareIOS index b1c2e08..45023b4 100755 --- a/util/step/prepareIOS +++ b/util/step/prepareIOS @@ -5,5 +5,45 @@ TARGET=$1 STEP=$((STEP+1)) echo -e "\n> > > > Step №$STEP. Generate iOS project for '$TARGET'" +# iOS rendering goes through ghera/raylib-iOS: a raylib fork that renders +# OpenGL ES via ANGLE (Metal backend). Its stable releases ship prebuilt +# xcframeworks (raylib + libEGL + libGLESv2, ~46 MB), so they are downloaded +# on demand and never committed. +# +# Unlike the fork's own app, ver-ios does not link raylib.xcframework (its +# rcore.o defines main() and a private view controller). We only use its +# headers: raylib's renderer (rlgl) is compiled into components/raybri/ios, +# and EGL/ANGLE provides the GL context. +RAYLIB_IOS_TAG=6.0.7-iOS +FRAMEWORKS=$SDIR/../$TARGET/ver-ios/Frameworks + +MISSING=0 +for FRAMEWORK in raylib libEGL libGLESv2; do + [[ -d "$FRAMEWORKS/$FRAMEWORK.xcframework" ]] || MISSING=1 +done + +if [[ $MISSING -eq 1 ]]; then + echo "Raylib iOS xcframeworks missing, downloading $RAYLIB_IOS_TAG..." + mkdir -p "$FRAMEWORKS" + TMP=$(mktemp -d) + curl -sL --retry 3 -o "$TMP/raylib-ios.zip" \ + "https://github.com/ghera/raylib-iOS/releases/download/$RAYLIB_IOS_TAG/raylib-ios-xcframeworks-$RAYLIB_IOS_TAG.zip" + unzip -q "$TMP/raylib-ios.zip" -d "$TMP" + cp -R "$TMP/raylib-ios-xcframeworks/raylib.xcframework" "$FRAMEWORKS/" + cp -R "$TMP/raylib-ios-xcframeworks/libEGL.xcframework" "$FRAMEWORKS/" + cp -R "$TMP/raylib-ios-xcframeworks/libGLESv2.xcframework" "$FRAMEWORKS/" + rm -rf "$TMP" +fi + +# The ANGLE headers are shipped as framework Headers directories but their +# internal includes expect the `libEGL/...` and `libGLESv2/...` layout, so +# stage symlinks for the header search path. The headers are identical for +# device and simulator, so one slice is enough. +mkdir -p "$FRAMEWORKS/include" +ln -sfn "../libEGL.xcframework/ios-arm64_x86_64-simulator/libEGL.framework/Headers" \ + "$FRAMEWORKS/include/libEGL" +ln -sfn "../libGLESv2.xcframework/ios-arm64_x86_64-simulator/libGLESv2.framework/Headers" \ + "$FRAMEWORKS/include/libGLESv2" + cd $SDIR/../$TARGET/ver-ios xcodegen -- 2.53.0 From 27b7679bf8e17abe78a03bbe7afa4f640b2b7809 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: Fri, 23 Oct 2026 06:25:13 +0300 Subject: [PATCH 06/12] mv --- components/render/ios/{ => view}/RenderGLView.swift | 0 components/render/ios/{ => view}/RenderView.swift | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename components/render/ios/{ => view}/RenderGLView.swift (100%) rename components/render/ios/{ => view}/RenderView.swift (100%) diff --git a/components/render/ios/RenderGLView.swift b/components/render/ios/view/RenderGLView.swift similarity index 100% rename from components/render/ios/RenderGLView.swift rename to components/render/ios/view/RenderGLView.swift diff --git a/components/render/ios/RenderView.swift b/components/render/ios/view/RenderView.swift similarity index 100% rename from components/render/ios/RenderView.swift rename to components/render/ios/view/RenderView.swift -- 2.53.0 From 81bfac20f9ad2365aca1a028338203085ba65934 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: Fri, 23 Oct 2026 06:26:40 +0300 Subject: [PATCH 07/12] clarify --- components/render/ios/view/RenderView.swift | 2 -- components/render/mac/view/RenderView.swift | 1 - 2 files changed, 3 deletions(-) diff --git a/components/render/ios/view/RenderView.swift b/components/render/ios/view/RenderView.swift index 0d0d4e0..d10d3fe 100644 --- a/components/render/ios/view/RenderView.swift +++ b/components/render/ios/view/RenderView.swift @@ -1,7 +1,5 @@ import SwiftUI -// SwiftUI counterpart of the macOS RenderView. It vends the shared GL view, -// which RenderVM also keeps alive and drives with a timer. struct RenderView: UIViewRepresentable { func makeUIView(context: Context) -> RenderGLView { RenderVM.shared!.glView 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 -- 2.53.0 From 197d93ee7bd603b182123556e2b72917cddceb0d 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: Fri, 23 Oct 2026 06:29:11 +0300 Subject: [PATCH 08/12] reuse renderVM --- components/render/ios/RenderVM.swift | 17 +---------------- components/render/ios/view/RenderGLView.swift | 16 +++++++--------- 2 files changed, 8 insertions(+), 25 deletions(-) mode change 100644 => 120000 components/render/ios/RenderVM.swift diff --git a/components/render/ios/RenderVM.swift b/components/render/ios/RenderVM.swift deleted file mode 100644 index 3a21125..0000000 --- a/components/render/ios/RenderVM.swift +++ /dev/null @@ -1,16 +0,0 @@ -import Combine -import Foundation - -// iOS counterpart of the macOS RenderVM: it owns the view raylib draws into -// and the timer that drives it. The actual rendering lives in raybriIOS.mm. -final class RenderVM: ObservableObject { - static private(set) weak var shared: RenderVM? - - let glView = RenderGLView(frame: .zero) - var startTime: CFTimeInterval = 0 - var timer: Timer? - - init() { - Self.shared = self - } -} diff --git a/components/render/ios/RenderVM.swift b/components/render/ios/RenderVM.swift new file mode 120000 index 0000000..05cef35 --- /dev/null +++ b/components/render/ios/RenderVM.swift @@ -0,0 +1 @@ +../renderVM.swift \ No newline at end of file diff --git a/components/render/ios/view/RenderGLView.swift b/components/render/ios/view/RenderGLView.swift index b169770..8bcacea 100644 --- a/components/render/ios/view/RenderGLView.swift +++ b/components/render/ios/view/RenderGLView.swift @@ -6,8 +6,6 @@ import UIKit // and when its backing size changes. final class RenderGLView: UIView { private weak var renderVM: RenderVM? - private var didInit = false - private var lastPixelSize: [Int32] = [0, 0] override init(frame: CGRect) { super.init(frame: frame) @@ -32,29 +30,29 @@ final class RenderGLView: UIView { contentScaleFactor = window.screen.nativeScale layer.contentsScale = contentScaleFactor - guard !didInit, let vm = RenderVM.shared else { return } + guard let vm = RenderVM.shared, !vm.didPrepareGL else { return } guard renderInit(vm) else { return } renderVM = vm - didInit = true - lastPixelSize = renderPixelSize(self) + vm.didPrepareGL = true + vm.pixelSize = renderPixelSize(self) renderStartTimer(vm) } override func layoutSubviews() { super.layoutSubviews() - guard didInit else { return } + guard let vm = renderVM, vm.didPrepareGL else { return } let size = renderPixelSize(self) - guard size != lastPixelSize else { return } + guard size != vm.pixelSize else { return } - lastPixelSize = size + vm.pixelSize = size raybri_ios_resize(size[0], size[1]) } deinit { - guard didInit, let vm = renderVM else { return } + guard let vm = renderVM, vm.didPrepareGL else { return } renderDeinit(vm) } } -- 2.53.0 From 33fae994fc9dc6860a809347d9b9d3325b9b5792 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: Fri, 23 Oct 2026 06:45:53 +0300 Subject: [PATCH 09/12] mov --- AGENTS.md | 4 ++-- components/render/ios/renderAux.swift | 3 ++- components/render/{ => mac}/renderAux.swift | 0 ogs-chkgfx/ver-mac/src/render/renderAux.swift | 2 +- ogs-mahjong/ver-mac/src/render/renderAux.swift | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) rename components/render/{ => mac}/renderAux.swift (100%) diff --git a/AGENTS.md b/AGENTS.md index 9026946..7b333ba 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -63,7 +63,7 @@ game/ver-mac/ macOS app (SPM executable target "ogs-mahjong") raybri/raybri.c -> symlink components/raybri/raybri.c raybri/raybri.h -> symlink components/raybri/raybri.h render/render.swift -> symlink components/render/render.swift - render/renderAux.swift -> symlink components/render/renderAux.swift + render/renderAux.swift -> symlink components/render/mac/renderAux.swift render/renderConst.swift -> symlink components/render/renderConst.swift render/renderConstShader.swift -> symlink .../renderConstShader.swift render/renderEffect.swift -> symlink components/render/renderEffect.swift @@ -99,7 +99,7 @@ src/other/other.swift -> ../../../../components/other/other.swift ( src/raybri/raybri.c -> ../../../../components/raybri/raybri.c (4 up) src/raybri/raybri.h -> ../../../../components/raybri/raybri.h (4 up) src/render/render.swift -> ../../../../components/render/render.swift (4 up) -src/render/renderAux.swift -> ../../../../components/render/renderAux.swift (4 up) +src/render/renderAux.swift -> ../../../../components/render/mac/renderAux.swift (4 up) src/render/renderConst.swift-> ../../../../components/render/renderConst.swift (4 up) src/render/renderConstShader.swift -> ../../../../components/render/renderConstShader.swift (4 up) src/render/renderEffect.swift -> ../../../../components/render/renderEffect.swift (4 up) diff --git a/components/render/ios/renderAux.swift b/components/render/ios/renderAux.swift index 9fc07cb..4b31e5b 100644 --- a/components/render/ios/renderAux.swift +++ b/components/render/ios/renderAux.swift @@ -5,7 +5,8 @@ import UIKit // presents into the view's layer, so there is no draw(_:) / needsDisplay pass // like in the NSOpenGLView on macOS. func renderDraw(_ vm: RenderVM) { - raybri_ios_render(CACurrentMediaTime() - vm.startTime) + let t = CACurrentMediaTime() - vm.startTime + raybri_ios_render(t) } // Backing-pixel size of the view, which is what EGL/ANGLE renders into. diff --git a/components/render/renderAux.swift b/components/render/mac/renderAux.swift similarity index 100% rename from components/render/renderAux.swift rename to components/render/mac/renderAux.swift diff --git a/ogs-chkgfx/ver-mac/src/render/renderAux.swift b/ogs-chkgfx/ver-mac/src/render/renderAux.swift index 1975b82..a7dec7f 120000 --- a/ogs-chkgfx/ver-mac/src/render/renderAux.swift +++ b/ogs-chkgfx/ver-mac/src/render/renderAux.swift @@ -1 +1 @@ -../../../../components/render/renderAux.swift \ No newline at end of file +../../../../components/render/mac/renderAux.swift \ No newline at end of file diff --git a/ogs-mahjong/ver-mac/src/render/renderAux.swift b/ogs-mahjong/ver-mac/src/render/renderAux.swift index 1975b82..a7dec7f 120000 --- a/ogs-mahjong/ver-mac/src/render/renderAux.swift +++ b/ogs-mahjong/ver-mac/src/render/renderAux.swift @@ -1 +1 @@ -../../../../components/render/renderAux.swift \ No newline at end of file +../../../../components/render/mac/renderAux.swift \ No newline at end of file -- 2.53.0 From 4b70bd990661ed6486ea8cb40b65bc220b5669e0 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: Fri, 23 Oct 2026 06:51:25 +0300 Subject: [PATCH 10/12] c mm --- components/raybri/ios/{raybriIOS.mm => raybriIOS.c} | 2 -- 1 file changed, 2 deletions(-) rename components/raybri/ios/{raybriIOS.mm => raybriIOS.c} (99%) diff --git a/components/raybri/ios/raybriIOS.mm b/components/raybri/ios/raybriIOS.c similarity index 99% rename from components/raybri/ios/raybriIOS.mm rename to components/raybri/ios/raybriIOS.c index c40fd91..f7cb382 100644 --- a/components/raybri/ios/raybriIOS.mm +++ b/components/raybri/ios/raybriIOS.c @@ -10,8 +10,6 @@ // GL runs on ANGLE (libEGL + libGLESv2, Metal backend), taken from the same // ghera release as raylib's headers. -#import - #include "raybriIOS.h" #include -- 2.53.0 From e0f54dde75db0b11b6d196925c7da7661c17c973 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: Fri, 23 Oct 2026 06:57:04 +0300 Subject: [PATCH 11/12] some --- .../raybri/ios/RaybriIOS-Bridging-Header.h | 2 +- components/raybri/ios/raybriIOS.c | 10 +++--- components/raybri/ios/raybriIOS.h | 28 ---------------- components/raybri/raybri.h | 33 ++++++++++++++++--- components/render/ios/renderAux.swift | 2 +- components/render/ios/renderEffect.swift | 4 +-- components/render/ios/view/RenderGLView.swift | 2 +- 7 files changed, 38 insertions(+), 43 deletions(-) delete mode 100644 components/raybri/ios/raybriIOS.h diff --git a/components/raybri/ios/RaybriIOS-Bridging-Header.h b/components/raybri/ios/RaybriIOS-Bridging-Header.h index dc8f953..0bc63c3 100644 --- a/components/raybri/ios/RaybriIOS-Bridging-Header.h +++ b/components/raybri/ios/RaybriIOS-Bridging-Header.h @@ -1,6 +1,6 @@ #ifndef OGS_MAHJONG_RAYLIB_IOS_BRIDGING_HEADER_H #define OGS_MAHJONG_RAYLIB_IOS_BRIDGING_HEADER_H -#import "raybriIOS.h" +#include "../raybri.h" #endif diff --git a/components/raybri/ios/raybriIOS.c b/components/raybri/ios/raybriIOS.c index f7cb382..36cf2a2 100644 --- a/components/raybri/ios/raybriIOS.c +++ b/components/raybri/ios/raybriIOS.c @@ -10,7 +10,7 @@ // GL runs on ANGLE (libEGL + libGLESv2, Metal backend), taken from the same // ghera release as raylib's headers. -#include "raybriIOS.h" +#include "../raybri.h" #include #include @@ -90,7 +90,7 @@ static int sr_create_surface(void) return 1; } -int raybri_ios_init(void *layer, int width, int height) +int raybri_init(void *layer, int width, int height) { if (sr_ready) return 1; @@ -166,7 +166,7 @@ int raybri_ios_init(void *layer, int width, int height) return 1; } -void raybri_ios_resize(int width, int height) +void raybri_resize(int width, int height) { if (!sr_ready) return; @@ -181,7 +181,7 @@ void raybri_ios_resize(int width, int height) sr_log("surface recreated"); } -void raybri_ios_render(double time) +void raybri_render(double time) { if (!sr_ready) return; @@ -200,7 +200,7 @@ void raybri_ios_render(double time) eglSwapBuffers(sr_display, sr_surface); } -void raybri_ios_shutdown(void) +void raybri_shutdown(void) { if (!sr_ready) return; diff --git a/components/raybri/ios/raybriIOS.h b/components/raybri/ios/raybriIOS.h deleted file mode 100644 index f5226da..0000000 --- a/components/raybri/ios/raybriIOS.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef OGS_MAHJONG_RAYLIB_IOS_BRIDGE_H -#define OGS_MAHJONG_RAYLIB_IOS_BRIDGE_H - -#ifdef __cplusplus -extern "C" { -#endif - -// Initialise EGL (ANGLE) on the given CALayer and bring up raylib's rlgl. -// Unlike the ghera/raylib-iOS backend, no raylib window, view controller or -// app delegate is involved: the caller owns the layer and the frame timer. -// Returns 1 on success, 0 on failure. -int raybri_ios_init(void *layer, int width, int height); - -// Recreate the EGL window surface for a new drawable size (backing pixels). -void raybri_ios_resize(int width, int height); - -// Render one frame: clear the drawable to a time-based background colour and -// present it. `time` is monotonically increasing seconds. -void raybri_ios_render(double time); - -// Release rlgl state and the EGL surface/context/display. -void raybri_ios_shutdown(void); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/components/raybri/raybri.h b/components/raybri/raybri.h index 5493ad3..39b3f9e 100644 --- a/components/raybri/raybri.h +++ b/components/raybri/raybri.h @@ -1,6 +1,8 @@ #ifndef OGS_MAHJONG_RAYLIB_BRIDGE_H #define OGS_MAHJONG_RAYLIB_BRIDGE_H +#include + #ifdef __cplusplus extern "C" { #endif @@ -14,6 +16,31 @@ typedef struct raybri_config { float ground_size; // ground plane extent } raybri_config; +// The bridge always renders into a GL context owned by the app (no raylib +// window), but the platform setup and the current feature set differ: +// macOS renders the textured cube through raybri.c, iOS currently only clears +// its EGL/ANGLE drawable through raybriIOS.c. The common names keep the Swift +// call sites and lifecycle symmetrical. + +// Resize the drawable (backing pixels). On macOS this only records the size; +// on iOS it recreates the EGL window surface when it changes. +void raybri_resize(int width, int height); + +// Release the GL/EGL resources owned by the bridge. +void raybri_shutdown(void); + +#if TARGET_OS_IPHONE + +// Initialise EGL (ANGLE) on the given CALayer and bring up rlgl. +// Returns 1 on success, 0 on failure. +int raybri_init(void *layer, int width, int height); + +// Render one frame: clear the drawable to a time-based background colour and +// present it. `time` is monotonically increasing seconds. +void raybri_render(double time); + +#else + // Initialise the OpenGL-backed raylib scene (no raylib window is created). // The four shader sources come from renderConstShader.swift. void raybri_init( @@ -27,17 +54,13 @@ void raybri_init( // Load the textured cube glTF model. void raybri_load_model(const char *gltf_path); -// Resize the viewport. -void raybri_resize(int width, int height); - // Cube rotation, driven by the application (Euler angles, degrees). void raybri_set_rotation(float x_deg, float y_deg, float z_deg); // Render one frame. void raybri_render(void); -// Release all GPU resources. -void raybri_shutdown(void); +#endif #ifdef __cplusplus } diff --git a/components/render/ios/renderAux.swift b/components/render/ios/renderAux.swift index 4b31e5b..349680b 100644 --- a/components/render/ios/renderAux.swift +++ b/components/render/ios/renderAux.swift @@ -6,7 +6,7 @@ import UIKit // like in the NSOpenGLView on macOS. func renderDraw(_ vm: RenderVM) { let t = CACurrentMediaTime() - vm.startTime - raybri_ios_render(t) + raybri_render(t) } // Backing-pixel size of the view, which is what EGL/ANGLE renders into. diff --git a/components/render/ios/renderEffect.swift b/components/render/ios/renderEffect.swift index 2de4e51..d129eda 100644 --- a/components/render/ios/renderEffect.swift +++ b/components/render/ios/renderEffect.swift @@ -7,7 +7,7 @@ import UIKit func renderInit(_ vm: RenderVM) -> Bool { let size = renderPixelSize(vm.glView) let layer = Unmanaged.passUnretained(vm.glView.layer).toOpaque() - let ok = raybri_ios_init(layer, size[0], size[1]) != 0 + let ok = raybri_init(layer, size[0], size[1]) != 0 if !ok { otherPrintStderr("ИГР renderInit: EGL/ANGLE initialization failed") } @@ -31,5 +31,5 @@ func renderStartTimer(_ vm: RenderVM) { func renderDeinit(_ vm: RenderVM) { vm.timer?.invalidate() vm.timer = nil - raybri_ios_shutdown() + raybri_shutdown() } diff --git a/components/render/ios/view/RenderGLView.swift b/components/render/ios/view/RenderGLView.swift index 8bcacea..4afda0d 100644 --- a/components/render/ios/view/RenderGLView.swift +++ b/components/render/ios/view/RenderGLView.swift @@ -48,7 +48,7 @@ final class RenderGLView: UIView { guard size != vm.pixelSize else { return } vm.pixelSize = size - raybri_ios_resize(size[0], size[1]) + raybri_resize(size[0], size[1]) } deinit { -- 2.53.0 From 56d4b2dd88be0bfca68feb93e4c35a6d85073b77 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: Fri, 23 Oct 2026 15:27:28 +0300 Subject: [PATCH 12/12] single bg color --- components/raybri/ios/raybriIOS.c | 31 ++---------------------- components/raybri/raybri.h | 10 +++----- components/render/ios/renderAux.swift | 4 +-- components/render/ios/renderEffect.swift | 3 --- 4 files changed, 6 insertions(+), 42 deletions(-) diff --git a/components/raybri/ios/raybriIOS.c b/components/raybri/ios/raybriIOS.c index 36cf2a2..dbcd755 100644 --- a/components/raybri/ios/raybriIOS.c +++ b/components/raybri/ios/raybriIOS.c @@ -12,7 +12,6 @@ #include "../raybri.h" -#include #include #include @@ -41,25 +40,6 @@ static void sr_log(const char *text) fflush(stderr); } -static void sr_hsv_to_rgb(float h, float s, float v, float *r, float *g, float *b) -{ - float i = floorf(h * 6.0f); - float f = h * 6.0f - i; - float p = v * (1.0f - s); - float q = v * (1.0f - f * s); - float t = v * (1.0f - (1.0f - f) * s); - - switch (((int)i) % 6) - { - case 0: *r = v; *g = t; *b = p; break; - case 1: *r = q; *g = v; *b = p; break; - case 2: *r = p; *g = v; *b = t; break; - case 3: *r = p; *g = q; *b = v; break; - case 4: *r = t; *g = p; *b = v; break; - default: *r = v; *g = p; *b = q; break; - } -} - // (Re)create the EGL window surface on the layer handed to us by UIKit. static int sr_create_surface(void) { @@ -181,20 +161,13 @@ void raybri_resize(int width, int height) sr_log("surface recreated"); } -void raybri_render(double time) +void raybri_render(void) { if (!sr_ready) return; if (eglMakeCurrent(sr_display, sr_surface, sr_surface, sr_context) == EGL_FALSE) return; - // Background colour cycles through the hue wheel over time. - float hue = fmodf((float)time * 0.15f, 1.0f); - float r = 0.0f; - float g = 0.0f; - float b = 0.0f; - sr_hsv_to_rgb(hue, 0.65f, 0.85f, &r, &g, &b); - - rlClearColor((unsigned char)(r * 255.0f), (unsigned char)(g * 255.0f), (unsigned char)(b * 255.0f), 255); + rlClearColor(0, 0, 255, 255); rlClearScreenBuffers(); eglSwapBuffers(sr_display, sr_surface); diff --git a/components/raybri/raybri.h b/components/raybri/raybri.h index 39b3f9e..19de147 100644 --- a/components/raybri/raybri.h +++ b/components/raybri/raybri.h @@ -26,6 +26,9 @@ typedef struct raybri_config { // on iOS it recreates the EGL window surface when it changes. void raybri_resize(int width, int height); +// Render one frame. +void raybri_render(void); + // Release the GL/EGL resources owned by the bridge. void raybri_shutdown(void); @@ -35,10 +38,6 @@ void raybri_shutdown(void); // Returns 1 on success, 0 on failure. int raybri_init(void *layer, int width, int height); -// Render one frame: clear the drawable to a time-based background colour and -// present it. `time` is monotonically increasing seconds. -void raybri_render(double time); - #else // Initialise the OpenGL-backed raylib scene (no raylib window is created). @@ -57,9 +56,6 @@ void raybri_load_model(const char *gltf_path); // Cube rotation, driven by the application (Euler angles, degrees). void raybri_set_rotation(float x_deg, float y_deg, float z_deg); -// Render one frame. -void raybri_render(void); - #endif #ifdef __cplusplus diff --git a/components/render/ios/renderAux.swift b/components/render/ios/renderAux.swift index 349680b..0b91a78 100644 --- a/components/render/ios/renderAux.swift +++ b/components/render/ios/renderAux.swift @@ -1,12 +1,10 @@ -import QuartzCore import UIKit // Render a single frame. The timer calls this directly: an EGL/ANGLE surface // presents into the view's layer, so there is no draw(_:) / needsDisplay pass // like in the NSOpenGLView on macOS. func renderDraw(_ vm: RenderVM) { - let t = CACurrentMediaTime() - vm.startTime - raybri_render(t) + raybri_render() } // Backing-pixel size of the view, which is what EGL/ANGLE renders into. diff --git a/components/render/ios/renderEffect.swift b/components/render/ios/renderEffect.swift index d129eda..297492d 100644 --- a/components/render/ios/renderEffect.swift +++ b/components/render/ios/renderEffect.swift @@ -1,5 +1,4 @@ import Foundation -import QuartzCore import UIKit // Bring up EGL/ANGLE on the view's layer. Returns false when the surface could @@ -17,8 +16,6 @@ func renderInit(_ vm: RenderVM) -> Bool { // Same shape as the macOS timer: a repeating timer on the main run loop, but // here it calls the renderer directly instead of flagging the view for redraw. func renderStartTimer(_ vm: RenderVM) { - vm.startTime = CACurrentMediaTime() - let timer = Timer(timeInterval: 1.0 / RENDER_FPS, repeats: true) { [weak vm] _ in guard let vm else { return } renderDraw(vm) -- 2.53.0