From 2b556a4a589572ee359a33013ce801c5b869c96e 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, 30 Oct 2026 15:17:24 +0100 Subject: [PATCH] Support iOS for ogs-blue (#7) --- AGENTS.md | 300 ++++++------------ README.md | 11 +- components/egl/egl.h | 87 +++++ components/egl/eglConst.h | 33 ++ .../raybri/{raybriAux.c => mac/raybriAux.h} | 22 +- components/raybri/raybri.c | 29 -- components/raybri/raybri.h | 34 ++ components/raybri/raybriAux.h | 6 - components/raybri/raybriConst.c | 3 - components/raybri/raybriConst.h | 10 + components/render/ios/renderAux.swift | 19 ++ components/render/ios/renderEffect.swift | 43 +++ components/render/ios/view/RenderGLView.swift | 24 ++ components/render/ios/view/RenderView.swift | 10 + components/render/{ => mac}/renderAux.swift | 4 + components/render/mac/renderConstMac.swift | 11 + .../render/{ => mac}/renderEffect.swift | 3 +- components/render/mac/view/RenderGLView.swift | 24 +- components/render/mac/view/RenderView.swift | 1 - components/render/renderConst.swift | 13 - docs/mirror-summary.md | 68 ++++ ogs-blue/dialect.yml | 34 +- ogs-blue/ver-ios/Info.plist | 2 + ogs-blue/ver-ios/project.yml | 22 +- ogs-blue/ver-ios/src/AppDelegate.swift | 4 + ogs-blue/ver-ios/src/Blue.c | 15 + ogs-blue/ver-ios/src/BlueApp.swift | 6 +- ogs-blue/ver-ios/src/BlueBridgingHeader.h | 7 + ogs-blue/ver-ios/src/egl/egl.h | 1 + ogs-blue/ver-ios/src/egl/eglConst.h | 1 + ogs-blue/ver-ios/src/raybri/raybri.h | 1 + ogs-blue/ver-ios/src/raybri/raybriConst.h | 1 + ogs-blue/ver-ios/src/render/renderAux.swift | 1 + ogs-blue/ver-ios/src/render/renderConst.swift | 1 + .../ver-ios/src/render/renderEffect.swift | 1 + .../ver-ios/src/render/renderTMPIOS.swift | 4 - .../ver-ios/src/render/view/RenderView.swift | 1 + ogs-blue/ver-mac/Package.swift | 10 +- ogs-blue/ver-mac/src/Blue.c | 8 + ogs-blue/ver-mac/src/dialect.swift | 71 +++++ ogs-blue/ver-mac/src/raybri/raybri.c | 1 - ogs-blue/ver-mac/src/raybri/raybriAux.c | 1 - ogs-blue/ver-mac/src/raybri/raybriAux.h | 2 +- ogs-blue/ver-mac/src/raybri/raybriConst.c | 1 - ogs-blue/ver-mac/src/render/renderAux.swift | 2 +- .../ver-mac/src/render/renderConstMac.swift | 1 + .../ver-mac/src/render/renderEffect.swift | 2 +- ogs-chkgfx/ver-mac/src/raybri/raybri.c | 2 +- ogs-chkgfx/ver-mac/src/raybri/raybriAux.c | 1 + ogs-chkgfx/ver-mac/src/raybri/raybriAux.h | 1 + ogs-chkgfx/ver-mac/src/raybri/raybriConst.c | 2 +- ogs-chkgfx/ver-mac/src/raybri/raybriConst.h | 2 +- ogs-mahjong/ver-mac/src/raybri/raybriConst.c | 1 - util/paths | 3 + util/prepare-ogs-blue-ios | 4 +- util/step/checkRaylibIOS | 16 + util/step/{prepareIOS => generateIOS} | 0 util/step/prepareANGLE | 22 ++ 58 files changed, 710 insertions(+), 300 deletions(-) create mode 100644 components/egl/egl.h create mode 100644 components/egl/eglConst.h rename components/raybri/{raybriAux.c => mac/raybriAux.h} (62%) delete mode 100644 components/raybri/raybri.c delete mode 100644 components/raybri/raybriAux.h delete mode 100644 components/raybri/raybriConst.c create mode 100644 components/render/ios/renderAux.swift create mode 100644 components/render/ios/renderEffect.swift create mode 100644 components/render/ios/view/RenderView.swift rename components/render/{ => mac}/renderAux.swift (85%) create mode 100644 components/render/mac/renderConstMac.swift rename components/render/{ => mac}/renderEffect.swift (95%) create mode 100644 docs/mirror-summary.md create mode 100644 ogs-blue/ver-ios/src/Blue.c create mode 100644 ogs-blue/ver-ios/src/BlueBridgingHeader.h create mode 120000 ogs-blue/ver-ios/src/egl/egl.h create mode 120000 ogs-blue/ver-ios/src/egl/eglConst.h create mode 120000 ogs-blue/ver-ios/src/raybri/raybri.h create mode 120000 ogs-blue/ver-ios/src/raybri/raybriConst.h create mode 120000 ogs-blue/ver-ios/src/render/renderAux.swift create mode 120000 ogs-blue/ver-ios/src/render/renderConst.swift create mode 120000 ogs-blue/ver-ios/src/render/renderEffect.swift delete mode 100644 ogs-blue/ver-ios/src/render/renderTMPIOS.swift create mode 120000 ogs-blue/ver-ios/src/render/view/RenderView.swift create mode 100644 ogs-blue/ver-mac/src/Blue.c delete mode 120000 ogs-blue/ver-mac/src/raybri/raybri.c delete mode 120000 ogs-blue/ver-mac/src/raybri/raybriAux.c delete mode 120000 ogs-blue/ver-mac/src/raybri/raybriConst.c create mode 120000 ogs-blue/ver-mac/src/render/renderConstMac.swift create mode 120000 ogs-chkgfx/ver-mac/src/raybri/raybriAux.c create mode 120000 ogs-chkgfx/ver-mac/src/raybri/raybriAux.h delete mode 120000 ogs-mahjong/ver-mac/src/raybri/raybriConst.c create mode 100755 util/step/checkRaylibIOS rename util/step/{prepareIOS => generateIOS} (100%) create mode 100755 util/step/prepareANGLE diff --git a/AGENTS.md b/AGENTS.md index 9026946..514202f 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1,218 +1,120 @@ -# OGS Mahjong (`mj`) +# OGS applications (`mj`) -A macOS SwiftUI app for **OGS Mahjong**, built on the **Dialect v4** declarative -reactive engine (see the sibling `../dialect` repo — this project is a -downstream consumer of its code generator). +Native SwiftUI applications using the Dialect v4 declarative reactive engine. +Version: `2.0.0`. Remote: `https://git.opengamestudio.org/mahjong/mahjong`. -Business logic lives in `dialect.yml` (YAML). A generator turns it into -`game/ver-mac/src/dialect.swift` (the runtime engine + `struct F` field -constants + component/should/effect registration). The Swift app shell -(`GameApp`/`AppDelegate`) and the SwiftUI views live outside the generated file -and talk to the engine through generated functions like `rootSet(...)`. +## Current status -Remote: `https://git.opengamestudio.org/mahjong/mahjong` · Version: `2.0.0` +- `ogs-blue/` is the active minimal graphics example for macOS and iOS: a solid + blue raylib background with a SwiftUI overlay. It has no model/texture/shadow + scene; rlgl still creates its default internal GPU resources. +- `ogs-mahjong/` contains the macOS Mahjong scaffold and counter-template logic; + Mahjong gameplay has not been implemented. +- `ogs-chkgfx/` is a companion graphics scaffold with macOS/iOS project files. + Older targets can lag behind shared-component changes; verify each target + separately before claiming it builds. +- The previous `game/ver-mac` and root `dialect.yml` layout is obsolete. -> `dialect.yml` is still the "Root / counter" template with a `Render` context -> bolted on: the Mahjong game logic has not been written yet. The app shell, -> packaging, symlink wiring and the raylib renderer are in place. +## Source layout -## Structure +- `/dialect.yml`: per-application logic; generates + `/ver-mac/src/dialect.swift`. Blue iOS links to its macOS generated file. +- `components/`: shared source of truth. App `src/` files use relative symlinks; + edit real component files and preserve symlink parity. +- `components/render/`: shared component/model/constants, plus mirrored `ios/` + and `mac/` effects, helpers and native/SwiftUI views. macOS additionally has + `renderConstMac.swift` for native pixel-format attributes. +- `components/raybri/raybri.h`: declarations plus implementation gated by + `RAYBRI_IMPLEMENTATION`; clears blue, renders and shuts down rlgl. +- `components/raybri/raybriConst.h`: shared constants with an implementation macro. + `components/raybri/mac/raybriAux.h`: macOS OpenGL symbol loader. +- `components/egl/egl.h` and `eglConst.h`: EGL state/helpers and configuration, + using single-header implementation macros. +- `ogs-blue/ver-{mac,ios}/src/Blue.c`: platform C implementation translation units. +- `history/gitjs/`: historical JavaScript Mahjong reference, outside the build. + `ref/swiftraylib` links to the sibling renderer sample. -``` -dialect.yml Single source of truth for the reactive logic. - Generates game/ver-mac/src/dialect.swift +## Graphics ownership and platform differences -components/ SHARED source-of-truth for all components. - other/other.swift Shared helpers (otherPrintStderr, otherWriteFile, - otherSetupConsoleLogging, ...) - raybri/raybri.h C API of the raylib bridge (raybri_config, raybri_init, - raybri_load_model, raybri_resize, raybri_set_rotation, - raybri_render, raybri_shutdown); extern "C" guards. - raybri/raybri.c Bridge implementation: rlgl scene, shadow pass, shaders. - root/root.swift RootComponent (owns DialectController, registers - effects + shoulds, sets didSetup on setup()) - root/rootVM.swift RootVM (ObservableObject / @Published countText) - root/mac/view/RootView.swift SwiftUI view: RenderView in a ZStack + UI - render/render.swift RenderComponent (controller, effects + shoulds) - render/renderVM.swift RenderVM (weak shared; glView, didPrepareGL, - pixelSize, startTime, timer) - render/renderConst.swift RENDER_CONFIG (raybri_config), RENDER_FPS, - RENDER_MODEL_CUBE, RENDER_OPENGL_ATTRS - render/renderConstShader.swift RENDER_SHADER_* GLSL sources (GLSL 150) - render/renderAux.swift renderDraw(vm), renderPixelSize(view) - render/renderEffect.swift renderInit, renderLoadCubeModel, - renderStartTimer, renderDeinit - render/mac/view/RenderGLView.swift Thin NSOpenGLView: pixel format, callbacks - -> renderSet(...), draw -> renderDraw - render/mac/view/RenderView.swift NSViewRepresentable wrapper +Every GPU operation requires its context current on the calling thread. +`rlLoadExtensions` also requires an existing current context; it precedes +`rlglInit`, not native context creation. -game/ver-mac/ macOS app (SPM executable target "ogs-mahjong") - Package.swift SPM manifest (macOS 13+, swift-tools 5.9); C target - "RaylibBridge" (path src/raybri, publicHeadersPath ".") + - links Homebrew raylib; the Swift target excludes raybri - and gets -Xcc -DGL_SILENCE_DEPRECATION - Info.plist Bundle id org.opengamestudio.Mahjong, exec ogs-mahjong - Resources/AppIcon.icns App icon - Resources/assets/ Bundled glTF assets: cube.gltf (static), - cube_texture.png, cube_normal.png - src/ - GameApp.swift @main SwiftUI App entry - AppDelegate.swift Creates Render/Root components + VMs, calls setup() - dialect.swift GENERATED — do not hand-edit (see chicken-egg below) - other/other.swift -> symlink components/other/other.swift - 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/renderConst.swift -> symlink components/render/renderConst.swift - render/renderConstShader.swift -> symlink .../renderConstShader.swift - render/renderEffect.swift -> symlink components/render/renderEffect.swift - render/renderVM.swift -> symlink components/render/renderVM.swift - render/view/RenderGLView.swift -> symlink components/render/mac/view/... - render/view/RenderView.swift -> symlink components/render/mac/view/... - root/root.swift -> symlink components/root/root.swift - root/rootVM.swift -> symlink components/root/rootVM.swift - root/view/RootView.swift -> symlink components/root/mac/view/... +macOS uses `NSOpenGLView` (OpenGL 3.2 Core). `renderInit` makes its context +current, enables VSync, loads extensions with the C loader callback and starts +raylib. The timer requests `needsDisplay`; `draw(_:)` forwards to `renderDraw`, +which activates the context, renders and presents via `flushBuffer`. -ref/swiftraylib Symlink to ../../swiftraylib — the raylib/SwiftUI - renderer sample the game will use for 3D rendering. +Blue's SPM `RaylibBridge` target compiles `src/Blue.c`, exposes headers in +`src/raybri`, and links Homebrew raylib. It does NOT define +`RLGL_IMPLEMENTATION`: Homebrew headers omit the `external/glad.h` needed to +compile desktop rlgl locally. Swift imports `RaylibBridge`. `RAYLIB_PREFIX` +defaults to `/opt/homebrew`; build scripts detect `brew --prefix raylib`. +The installed raylib may produce a deployment-target linker warning. -util/ Build/run scripts (see Build & Run) - paths APP_MAC = .build/OGS Mahjong.app - build-mac generateDialect -> buildMac -> packageMac - run-mac runMac - rm-mac-geom Resets saved window geometry - step/ Sourced steps: generateDialect, buildMac, - packageMac, runMac +On iOS, UIKit owns the view/layer and `RenderGLView.st` owns an `EGLState`. +Swift effects create EGL/ANGLE state and surface, make the context current, +and initialize raylib. Timer ticks call rendering directly; presentation uses +`eglSwapBuffers`. Pixel sizes come from view bounds and content scale. +Dialect's resize event triggers `renderRecreateSurface`; the macOS helper is +intentionally a no-op. Teardown must stop the timer, activate the context, +release rlgl resources, then destroy EGL surface/context/display resources. -history/gitjs/ GitJS "Glavred" history + the original JS source of the - web Mahjong, kept for reference — not part of the build. +Blue iOS uses `src/BlueBridgingHeader.h` to expose C APIs to Swift. `Blue.c` +compiles EGL helpers and rlgl using their implementation macros exactly once. +It uses the raylib-iOS XCFramework headers but does not link its full raylib +library. The app links/embeds `libEGL` and `libGLESv2` (ANGLE's Metal backend). +The XcodeGen settings define `PLATFORM_IOS`, `GRAPHICS_API_OPENGL_ES3`, and +`GL_GLEXT_PROTOTYPES`. Minimum iOS is 15.0; portrait and both landscape +orientations are enabled in Blue's Info.plist. + +## Build and prerequisites + +- macOS: `brew install raylib`. +- iOS project generation: `brew install xcodegen`; supply sibling + `../raylib-ios-xcframeworks` containing raylib/libEGL/libGLESv2 XCFrameworks. + `checkRaylibIOS` checks presence; it does not download them. +- Dialect: sibling `../dialect`, built with `(cd ../dialect && util/build-generator)`. + +```sh +util/build-ogs-blue-mac +util/run-ogs-blue-mac +util/prepare-ogs-blue-ios ``` -## Symlink parity rule +The corresponding macOS build/run scripts also exist for `ogs-chkgfx` and +`ogs-mahjong`; `prepare-ogs-chkgfx-ios` exists as well. Inspect their individual +configuration before assuming parity with Blue. -`components/` is the source of truth; `game/ver-mac/src/` contains real -directories whose files are **relative symlinks** back into `components/`: +macOS build scripts generate Dialect, run `swift build`, and package resources +from `ver-mac/res/` into `ver-mac/.build/.app`. iOS preparation checks +XCFrameworks, generates Dialect, stages ANGLE include/library symlinks in +`ver-ios/.build/`, then runs XcodeGen. Build Blue for Simulator with: -``` -src/other/other.swift -> ../../../../components/other/other.swift (4 up) -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/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) -src/render/renderVM.swift -> ../../../../components/render/renderVM.swift (4 up) -src/root/root.swift -> ../../../../components/root/root.swift (4 up) -src/root/rootVM.swift -> ../../../../components/root/rootVM.swift (4 up) -src/root/view/RootView.swift-> ../../../../../components/root/mac/view/RootView.swift (5 up) -src/render/view/RenderGLView.swift -> ../../../../../components/render/mac/view/RenderGLView.swift (5 up) -src/render/view/RenderView.swift -> ../../../../../components/render/mac/view/RenderView.swift (5 up) +```sh +xcodebuild -project 'ogs-blue/ver-ios/OGS blue.xcodeproj' -scheme ogs-blue \ + -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' \ + CODE_SIGNING_ALLOWED=NO build ``` -SPM silently **skips** a dangling symlink (no error), so after moving -`components/` or a subdir, audit for broken links: +Audit dangling source symlinks after moves (SPM can silently skip them): -```bash -find . -type l ! -exec test -e {} \; -not -path './.build/*' +```sh +find components ogs-blue ogs-chkgfx ogs-mahjong -type l ! -exec test -e {} \; -not -path '*/.build/*' ``` -## Prerequisite: the generator - -`util/step/generateDialect` calls the **sibling** dialect repo: - -```bash -$SDIR/../../dialect/util/run-generator --file=$SDIR/../dialect.yml -``` - -So `/Volumes/MOE/p/dialect` must exist and its generator must be built before -`util/build-mac` can regenerate: - -```bash -(cd ../dialect && util/build-generator) # once, or after dialect core changes -``` - -The generator resolves the `output:` path **relative to `dialect.yml`'s -directory**, which is why `dialect.yml` says `game/ver-mac/src/dialect.swift`. - -## Prerequisite: raylib - -The 3D scene links against Homebrew **raylib** (`brew install raylib`). The -`RaylibBridge` C target and the link step read `RAYLIB_PREFIX` (default -`/opt/homebrew`); `util/step/buildMac` auto-detects it via `brew --prefix raylib`. -The bridge renders with raylib's rlgl layer into an `NSOpenGLView` — raylib never -creates its own window. `RootView` puts `RenderView` (backed by `RenderGLView`) -behind the SwiftUI UI in a `ZStack`. A textured cube is drawn from `Resources/assets` (`cube.gltf` + -`cube_texture.png` + `cube_normal.png`); the app rotates it each frame via `raybri_set_rotation`. -(raylib's `LoadModelAnimations` only handles *skinned* meshes, so a plain -node-rotation glTF animation cannot be played by the renderer — hence the cube is -app-driven.) `packageMac` bundles `Resources/assets/` into the app. - -Shaders and render constants live in **Swift**, not in C: GLSL sources are -`RENDER_SHADER_*` in `components/render/renderConstShader.swift`, and -`RENDER_CONFIG` / `raybri_config` tunables are in `renderConst.swift`. `raybri_init` -compiles the shaders in place (no storage/`strdup`). `cube_normal.png` drives -tangentless normal mapping via the derivative-based `cotangentFrame`. The -context is OpenGL 3.2 Core (`RENDER_OPENGL_ATTRS`); on Apple Silicon the driver -still reports 4.1/GLSL 4.10. - -## Render architecture - -The `Render` dialect context owns the GL scene. `RenderGLView` is a thin -`NSOpenGLView`; it only translates AppKit callbacks into dialect fields, and the -`render*` files do the actual work. - -1. `AppDelegate` creates `RenderComponent` + `RenderVM` and calls - `render.setup()` -> `didSetup` -> `didLaunch` (should) -> `pixelSize = [1, 1]`. -2. SwiftUI builds `RenderView` -> `RenderGLView`; `prepareOpenGL()` sets - `F.didPrepareGL`. Its oneliners run `renderInit` (`raybri_init`), set - `RenderVM.didPrepareGL = true`, and `renderStartTimer`. -3. `reshape()` / `viewDidChangeBackingProperties()` compute the backing pixel - size via `renderPixelSize` and set `F.reshapePixelSize` / - `F.backingPixelSize`. The `pixelSize` shoulds fold these into `F.pixelSize`, - whose oneliner stores `RenderVM.pixelSize`. -4. The timer only sets `needsDisplay` every `1 / RENDER_FPS`. `draw(_:)` forwards - to `renderDraw` (make context current, `raybri_resize`, `raybri_set_rotation`, - `raybri_render`, `flushBuffer`). -5. A button click runs `rootSet(F.didClickIncrement)` -> RootComponent oneliner - `renderSet(F.didClickIncrement)` -> `renderLoadCubeModel` (the cube is loaded - on demand, not at startup). -6. `RenderGLView.deinit` sets `F.willDeinit` -> `renderDeinit` (stop timer, - `raybri_shutdown`). - -**GL context rule**: every raylib call must run with the view's context current. -`renderInit`, `renderLoadCubeModel`, `renderDeinit` and `renderDraw` all call -`openGLContext?.makeCurrentContext()` first. Loading a model/texture without it -fails silently with `WARNING: TEXTURE: Failed to load texture`. - -## Build & Run - -```bash -util/build-mac # generateDialect + swift build + package OGS Mahjong.app -util/run-mac # runs .build/OGS Mahjong.app/Contents/MacOS/ogs-mahjong -util/rm-mac-geom # reset the app's saved window geometry -``` - -`build-mac` sources `util/paths` then the `util/step/*` scripts in order: - -1. `generateDialect` — runs the sibling generator, writes `src/dialect.swift` -2. `buildMac` — `brew --prefix raylib` -> `RAYLIB_PREFIX`, `swift build` -3. `packageMac` — assembles `.build/OGS Mahjong.app` (binary `ogs-mahjong`, - `Info.plist`, `Resources/AppIcon.icns`, `Resources/assets/`) - ## Editing the dialect -- Add/modify contexts and components in `dialect.yml`, then run - `util/build-mac` to regenerate `dialect.swift`. +- Add/modify contexts and components in `/dialect.yml`, then run + `util/build--mac` to regenerate `dialect.swift`. - **Chicken-egg**: `struct F` (field-name constants) lives only in the - generated `dialect.swift`. Adding a new field to a context in `dialect.yml` + generated `dialect.swift`. Adding a new field to a context in `/dialect.yml` requires hand-patching its `static let = ""` into `struct F` in `dialect.swift` (ASCII-alphabetical order) if you cannot regenerate first, otherwise the build fails on `F.` being unresolved. - `dialect.swift` is generated — edits there are overwritten on the next - `util/build-mac`. Change the source (`dialect.yml` / `components/`) instead. -- **Validate `dialect.yml` after edits** (e.g. `ruby -ryaml -e 'YAML.load_file("dialect.yml")'`). + `util/build--mac`. Change the source (`/dialect.yml` / `components/`) instead. +- **Validate `/dialect.yml` after edits** (e.g. `ruby -ryaml -e 'YAML.load_file("ogs-blue/dialect.yml")'`). Every should-branch label (`1. Upon each ...`) MUST end with a colon — the parser (`components/yml/ymlFun.swift`) blindly `dropLast()`s it, so a missing colon silently eats the label's last character in the generated `about` @@ -246,17 +148,13 @@ Do not flip it on without addressing those. - Never call raylib / `raybri_*` without making the view's GL context current first (see the GL context rule above). -## Skill: source-file study documents - -When the task is to produce a source-code study document — a self-contained, -downloadable HTML file with a line-by-line table of the file and its -explanations (and, on request, a second version highlighting changes after a -fix) — follow the skill in `docs/file-summary.md`. - -- Write the result to `docs/.html` (e.g. `docs/RaylibGLView.html`) and - name the file's Git revision in the header. The file is the source of truth — - document the exact revision requested, not the working tree. -- Existing example: `docs/RaylibGLView.html` — documents the historical - single-cube `RaylibGLView.swift`, since split into `RenderGLView.swift` plus - the `render*` files. +## Source study documents +- Single-file source studies: follow [docs/file-summary.md](docs/file-summary.md). +- Mirrored platform studies: follow [docs/mirror-summary.md](docs/mirror-summary.md). + Produce one self-contained downloadable HTML with aligned function starts, + original line numbers, green/orange number fills, counts/percentages and a + non-repetitive explanation column. +- Existing mirrored example: `docs/render-platform-comparison.html`, documenting + the revision named in its header. Never silently substitute working-tree code + for a requested historical revision. diff --git a/README.md b/README.md index 6db0e2d..103bb52 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,12 @@ ## Prerequisites -* macOS +### macOS - `brew install raylib` +* `brew install raylib` -* iOS +### iOS - `brew install xcodegen` +* `brew install xcodegen` +* ghera's [raylib-ios-xcframeworks][rzip] release unpacked and placed alongside the project + +[rzip]: https://github.com/ghera/raylib-iOS/releases/download/6.2.0-iOS/raylib-ios-xcframeworks-6.2.0-iOS.zip diff --git a/components/egl/egl.h b/components/egl/egl.h new file mode 100644 index 0000000..d9817fe --- /dev/null +++ b/components/egl/egl.h @@ -0,0 +1,87 @@ +#ifndef EGL_H +#define EGL_H + +#include "eglConst.h" +#include +#include +#include + +typedef struct EGLState { + void *caLayer; + EGLConfig cfg; + EGLContext ctx; + EGLDisplay display; + EGLSurface surface; +} EGLState; + +bool eglInit(EGLState *st); +bool eglMakeCurrentContext(EGLState *st); +bool eglResetSurface(EGLState *st); + +// Source + +#if defined(EGL_IMPLEMENTATION) + +bool eglInit(EGLState *st) { + st->display = eglGetDisplay(EGL_DEFAULT_DISPLAY); + if (st->display == EGL_NO_DISPLAY) { + return false; + } + + if (eglInitialize(st->display, NULL, NULL) == EGL_FALSE) { + return false; + } + + if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE) { + return false; + } + + EGLint cfgCount = 0; + if ( + eglChooseConfig(st->display, EGL_CFG, &st->cfg, 1, &cfgCount) == EGL_FALSE || + cfgCount < 1 + ) { + return false; + } + + st->ctx = eglCreateContext(st->display, st->cfg, EGL_NO_CONTEXT, EGL_CTX); + if (st->ctx == EGL_NO_CONTEXT) { + return false; + } + + return true; +} + +bool eglMakeCurrentContext(EGLState *st) { + if (eglMakeCurrent(st->display, st->surface, st->surface, st->ctx) == EGL_FALSE) { + return false; + } + + return true; +} + +bool eglResetSurface(EGLState *st) { + // Destroy previous surface + if (st->surface != EGL_NO_SURFACE) { + eglDestroySurface(st->display, st->surface); + st->surface = EGL_NO_SURFACE; + } + + // Create new surface + // ANGLE on iOS takes a CALayer as the native window + st->surface = eglCreateWindowSurface( + st->display, + st->cfg, + (EGLNativeWindowType)st->caLayer, + NULL + ); + if (st->surface == EGL_NO_SURFACE) { + return false; + } + + return true; +} + +#endif // EGL_IMPLEMENTATION + +#endif // EGL_H diff --git a/components/egl/eglConst.h b/components/egl/eglConst.h new file mode 100644 index 0000000..b164ce6 --- /dev/null +++ b/components/egl/eglConst.h @@ -0,0 +1,33 @@ +#ifndef EGL_CONST_H +#define EGL_CONST_H + +#include + +// Header + +extern const EGLint EGL_CFG[]; +extern const EGLint EGL_CTX[]; + +// Source + +#if defined(EGL_CONST_IMPLEMENTATION) + +const EGLint EGL_CFG[] = { + 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 +}; + +const EGLint EGL_CTX[] = { + EGL_CONTEXT_CLIENT_VERSION, 3, + EGL_NONE +}; + +#endif // EGL_CONST_IMPLEMENTATION + +#endif // EGL_CONST_H diff --git a/components/raybri/raybriAux.c b/components/raybri/mac/raybriAux.h similarity index 62% rename from components/raybri/raybriAux.c rename to components/raybri/mac/raybriAux.h index e78ec49..be688ce 100644 --- a/components/raybri/raybriAux.c +++ b/components/raybri/mac/raybriAux.h @@ -1,6 +1,18 @@ +#ifndef RAYBRI_AUX_H +#define RAYBRI_AUX_H + +// Header + +void *raybriGLLoader(const char *name); +void raybriLoadExtensions(void); + +// Source + +#if defined(RAYBRI_AUX_IMPLEMENTATION) + #include -#include "raybriAux.h" #include "raybriConst.h" +#include "rlgl.h" #include // raylib is built as a static/dynamic library with GLFW baked in, but we never @@ -19,3 +31,11 @@ void *raybriGLLoader(const char *name) { return dlsym(handle, name); } + +void raybriLoadExtensions(void) { + rlLoadExtensions(raybriGLLoader); +} + +#endif // RAYBRI_AUX_IMPLEMENTATION + +#endif // RAYBRI_AUX_H diff --git a/components/raybri/raybri.c b/components/raybri/raybri.c deleted file mode 100644 index 6593117..0000000 --- a/components/raybri/raybri.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "raybri.h" -#include "raybriAux.h" -#include "rlgl.h" - -void raybriInit(void) { - //SetTraceLogLevel(LOG_WARNING); - - // Load OpenGL extensions - rlLoadExtensions((void *)raybriGLLoader); - // Initialize raylib graphics layer with a placeholder 1x1 framebuffer size - // Graphics layer includes default texture, shader, render batch and OpenGL state - rlglInit(1, 1); - // Background is painted in blue - rlClearColor(0, 0, 255, 255); -} - -void raybriRender(int width, int height) { - // Set the drawing area to the current pixel size - rlViewport(0, 0, width, height); - // Clear color and depth buffers for the next frame - rlClearScreenBuffers(); - // Draw any queued geometry - rlDrawRenderBatchActive(); -} - -void raybriShutdown(void) { - // Release rlgl buffers, shaders and textures - rlglClose(); -} diff --git a/components/raybri/raybri.h b/components/raybri/raybri.h index 902f706..4960c11 100644 --- a/components/raybri/raybri.h +++ b/components/raybri/raybri.h @@ -1,8 +1,42 @@ #ifndef RAYBRI_H #define RAYBRI_H +// Header + void raybriInit(void); void raybriRender(int width, int height); void raybriShutdown(void); +// Source + +#if defined(RAYBRI_IMPLEMENTATION) + +#include "rlgl.h" + +void raybriInit(void) { + //SetTraceLogLevel(LOG_WARNING); + + // Initialize raylib graphics layer with a placeholder 1x1 framebuffer size + // Graphics layer includes default texture, shader, render batch and OpenGL state + rlglInit(1, 1); + // Background is painted in blue + rlClearColor(0, 0, 255, 255); +} + +void raybriRender(int width, int height) { + // Set the drawing area to the current pixel size + rlViewport(0, 0, width, height); + // Clear color and depth buffers for the next frame + rlClearScreenBuffers(); + // Draw any queued geometry + rlDrawRenderBatchActive(); +} + +void raybriShutdown(void) { + // Release rlgl buffers, shaders and textures + rlglClose(); +} + +#endif // RAYBRI_IMPLEMENTATION + #endif // RAYBRI_H diff --git a/components/raybri/raybriAux.h b/components/raybri/raybriAux.h deleted file mode 100644 index 3e12210..0000000 --- a/components/raybri/raybriAux.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef RAYBRI_AUX_H -#define RAYBRI_AUX_H - -void *raybriGLLoader(const char *name); - -#endif // RAYBRI_AUX_H diff --git a/components/raybri/raybriConst.c b/components/raybri/raybriConst.c deleted file mode 100644 index bc427dc..0000000 --- a/components/raybri/raybriConst.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "raybriConst.h" - -const char RAYBRI_MAC_GL[] = "/System/Library/Frameworks/OpenGL.framework/OpenGL"; diff --git a/components/raybri/raybriConst.h b/components/raybri/raybriConst.h index cde42ee..f2ed1b1 100644 --- a/components/raybri/raybriConst.h +++ b/components/raybri/raybriConst.h @@ -1,6 +1,16 @@ #ifndef RAYBRI_CONST_H #define RAYBRI_CONST_H +// Header + extern const char RAYBRI_MAC_GL[]; +// Source + +#if defined(RAYBRI_CONST_IMPLEMENTATION) + +const char RAYBRI_MAC_GL[] = "/System/Library/Frameworks/OpenGL.framework/OpenGL"; + +#endif // RAYBRI_CONST_IMPLEMENTATION + #endif // RAYBRI_CONST_H diff --git a/components/render/ios/renderAux.swift b/components/render/ios/renderAux.swift new file mode 100644 index 0000000..c0bbc31 --- /dev/null +++ b/components/render/ios/renderAux.swift @@ -0,0 +1,19 @@ +import UIKit + +func renderDraw(_ vm: RenderVM) { + guard eglMakeCurrentContext(&vm.glView.st) else { return } + raybriRender(vm.pixelSize[0], vm.pixelSize[1]) + eglSwapBuffers(vm.glView.st.display, vm.glView.st.surface) +} + +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] +} + +func renderRecreateSurface(_ vm: RenderVM) { + eglResetSurface(&vm.glView.st) + eglMakeCurrentContext(&vm.glView.st) +} diff --git a/components/render/ios/renderEffect.swift b/components/render/ios/renderEffect.swift new file mode 100644 index 0000000..71c31df --- /dev/null +++ b/components/render/ios/renderEffect.swift @@ -0,0 +1,43 @@ +import Foundation +import QuartzCore +import UIKit + +func renderDeinit(_ vm: RenderVM) { + vm.timer?.invalidate() + vm.timer = nil + 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) + eglTerminate(vm.glView.st.display) +} + +func renderInit(_ vm: RenderVM) { + // On iOS EGL/ANGLE renders into the UIView's layer + let layer = Unmanaged.passUnretained(vm.glView.layer).toOpaque() + vm.glView.st.caLayer = layer + + guard eglInit(&vm.glView.st) else { fatalError("ERROR Could not initialize EGL") } + guard eglResetSurface(&vm.glView.st) else { fatalError("ERROR Could not reset EGL surface") } + guard eglMakeCurrentContext(&vm.glView.st) else { fatalError("ERROR Could not make EGL context current") } + + raybriInit() +} + +func renderStartTimer(_ vm: RenderVM) { + // Make a time mark for calculating time delta + vm.startTime = CACurrentMediaTime() + + // 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 + let timer = Timer(timeInterval: 1.0 / RENDER_FPS, repeats: true) { [weak vm] _ in + guard let vm else { return } + renderDraw(vm) + } + vm.timer = timer + // .common means holding buttons in UI does not pause this rendering timer + RunLoop.main.add(timer, forMode: .common) +} diff --git a/components/render/ios/view/RenderGLView.swift b/components/render/ios/view/RenderGLView.swift index 9580023..3c99009 100644 --- a/components/render/ios/view/RenderGLView.swift +++ b/components/render/ios/view/RenderGLView.swift @@ -1,11 +1,35 @@ import UIKit final class RenderGLView: UIView { + var st = EGLState() + override init(frame: CGRect) { super.init(frame: frame) + isOpaque = true + isUserInteractionEnabled = false } required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } + + deinit { + renderSet(F.willDeinit, true) + } + + override func didMoveToWindow() { + super.didMoveToWindow() + guard let window else { return } + contentScaleFactor = window.screen.nativeScale + layer.contentsScale = contentScaleFactor + + renderSet(F.didPrepareIOSGL, true); + } + + override func layoutSubviews() { + super.layoutSubviews() + let ps = renderPixelSize(self) + renderSet(F.reshapePixelSize, ps) + } + } diff --git a/components/render/ios/view/RenderView.swift b/components/render/ios/view/RenderView.swift new file mode 100644 index 0000000..47a985c --- /dev/null +++ b/components/render/ios/view/RenderView.swift @@ -0,0 +1,10 @@ +import SwiftUI +import UIKit + +struct RenderView: UIViewRepresentable { + func makeUIView(context: Context) -> RenderGLView { + RenderVM.shared!.glView + } + + func updateUIView(_ uiView: RenderGLView, context: Context) {} +} diff --git a/components/render/renderAux.swift b/components/render/mac/renderAux.swift similarity index 85% rename from components/render/renderAux.swift rename to components/render/mac/renderAux.swift index cd5d82a..abd3e21 100644 --- a/components/render/renderAux.swift +++ b/components/render/mac/renderAux.swift @@ -13,3 +13,7 @@ func renderPixelSize(_ view: NSView) -> [Int32] { let h = Int32(max(1, backing.height)) return [w, h] } + +func renderRecreateSurface(_ vm: RenderVM) { + // No-op on macOS +} diff --git a/components/render/mac/renderConstMac.swift b/components/render/mac/renderConstMac.swift new file mode 100644 index 0000000..d71ec37 --- /dev/null +++ b/components/render/mac/renderConstMac.swift @@ -0,0 +1,11 @@ +import AppKit + +let RENDER_OPENGL_ATTRS: [NSOpenGLPixelFormatAttribute] = [ + UInt32(NSOpenGLPFAOpenGLProfile), UInt32(NSOpenGLProfileVersion3_2Core), + UInt32(NSOpenGLPFAColorSize), 24, + UInt32(NSOpenGLPFAAlphaSize), 8, + UInt32(NSOpenGLPFADepthSize), 24, + UInt32(NSOpenGLPFADoubleBuffer), + UInt32(NSOpenGLPFAAccelerated), + 0 +] diff --git a/components/render/renderEffect.swift b/components/render/mac/renderEffect.swift similarity index 95% rename from components/render/renderEffect.swift rename to components/render/mac/renderEffect.swift index ad3d568..899b378 100644 --- a/components/render/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() } @@ -16,6 +16,7 @@ func renderInit(_ vm: RenderVM) { var swapInterval: Int32 = 1 vm.glView.openGLContext?.setValues(&swapInterval, for: .swapInterval) + raybriLoadExtensions() raybriInit() } diff --git a/components/render/mac/view/RenderGLView.swift b/components/render/mac/view/RenderGLView.swift index 4a56cd9..ef1c690 100644 --- a/components/render/mac/view/RenderGLView.swift +++ b/components/render/mac/view/RenderGLView.swift @@ -15,9 +15,20 @@ 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.didPrepareGL, true) + renderSet(F.didPrepareMacGL, true) } override func reshape() { @@ -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 diff --git a/components/render/renderConst.swift b/components/render/renderConst.swift index 1abea29..dea395c 100644 --- a/components/render/renderConst.swift +++ b/components/render/renderConst.swift @@ -1,15 +1,2 @@ -import AppKit - let RENDER_FPS = 60.0 - let RENDER_MODEL_CUBE = "/cube/cube.gltf" - -let RENDER_OPENGL_ATTRS: [NSOpenGLPixelFormatAttribute] = [ - UInt32(NSOpenGLPFAOpenGLProfile), UInt32(NSOpenGLProfileVersion3_2Core), - UInt32(NSOpenGLPFAColorSize), 24, - UInt32(NSOpenGLPFAAlphaSize), 8, - UInt32(NSOpenGLPFADepthSize), 24, - UInt32(NSOpenGLPFADoubleBuffer), - UInt32(NSOpenGLPFAAccelerated), - 0 -] diff --git a/docs/mirror-summary.md b/docs/mirror-summary.md new file mode 100644 index 0000000..d3edfa2 --- /dev/null +++ b/docs/mirror-summary.md @@ -0,0 +1,68 @@ +# Mirrored source-file study documents + +Use this workflow when comparing corresponding source files across platforms. +The established example is `docs/render-platform-comparison.html`. +For a single-file study, follow `docs/file-summary.md` instead. + +## Source and scope + +- Read sources from the exact requested Git revision with `git show REV:path`. + If no revision is specified, use HEAD and record its full commit hash. +- Discover matching relative filenames beneath the two platform directories. + State which platform-only files are excluded; never invent a counterpart. +- Produce one downloadable, self-contained HTML document in `docs/`, with + navigation links and one section per file pair. Preserve earlier documents + unless removal is requested. +- Record both source paths and the source revision. Preserve every source line, + original line number, indentation and blank line. Escape HTML characters. + +## Comparison layout + +- Use one table per pair with three columns: first platform's numbered source, + second platform's numbered source, and explanation. Do not create separate + line-by-line explanation tables or a Status column. +- Align corresponding function starts where possible. Insert missing-line + placeholders to keep later functions aligned; preserve source order and + original numbers. For example, macOS renderEffect line 12 aligns with iOS + line 16 at revision f0972f0d5ba796e3fa417081f43c00a9654b2aa6. +- Within each function or intervening block, align lines sequentially unless + better semantic alignment is needed. Equal line numbers need not share a row + when function alignment requires padding. +- Compare the exact source text in each aligned row, including whitespace. + Fill BOTH line-number backgrounds green when they match. Fill numbers orange + when they differ. A missing line is an orange-filled dash, not a plain dash. + Keep code backgrounds neutral and retain syntax highlighting. +- Include two filled statistics boxes beneath each section heading: green for + matching line count and percentage, orange for mismatched count and percentage. + Show the total line count as plain text alongside them. +- Count actual lines across BOTH files, including blank lines. A matching pair + contributes two matching lines; a differing pair contributes two mismatches; + a platform-only line contributes one mismatch. Missing placeholders do not + count. Percentages use the combined actual-line total. Recalculate after any + alignment change, and explain this counting convention in the document. + +## Explanations + +- Explain each distinct point once across the document, at its first relevant + occurrence. Leave later cells empty unless they add information. +- Eliminate semantic repetition, not just identical sentences. Do not repeat + platform/import boilerplate such as “UIKit serves iOS” for every import. +- Explain shared behavior once. Label iOS/macOS details only when needed to + distinguish behavior. Explain the reason or consequence of platform differences. +- Avoid redundant function summaries when the individual operations already + explain the same behavior. Leave blank lines and closing braces unexplained. +- When realigning rows, anchor each platform-specific explanation to its own + source line rather than to the old visual row. + +## Presentation and verification + +- Inline all CSS and syntax highlighting; no external fonts, scripts or requests. +- Use `
`, `white-space: pre-wrap`, and `overflow-wrap: anywhere`.
+  Give the code columns equal width; ensure long lines remain readable without
+  horizontal scrolling. Do not use striped row shading.
+- Verify every source line and number against the named Git revision, in order,
+  with no omissions or duplicates. Check function anchors, placeholder fills,
+  both matching-number fills, statistics, and explanation attachment.
+- Review explanations for repeated clauses as well as repeated sentences.
+- Inspect the rendered HTML for layout problems. Return a clickable file link;
+  tell the user to refresh an already open document after updates.
diff --git a/ogs-blue/dialect.yml b/ogs-blue/dialect.yml
index 8784c03..7c28b32 100644
--- a/ogs-blue/dialect.yml
+++ b/ogs-blue/dialect.yml
@@ -4,6 +4,12 @@ output:
     ver-mac/src/dialect.swift:
         type: swift
 
+BlueContext:
+    type: context
+    fields:
+        didLaunch: Bool
+        didSetup: Bool
+
 BlueComponent:
     type: component
     shoulds:
@@ -15,22 +21,19 @@ BlueComponent:
                 then:
                     c.didLaunch = true
 
-BlueContext:
-    type: context
-    fields:
-        didLaunch: Bool
-        didSetup: Bool
-
 RenderContext:
     type: context
     fields:
         backingPixelSize: [Int32]
         didLaunch: Bool
         didPrepareGL: Bool
+        didPrepareIOSGL: Bool
+        didPrepareMacGL: Bool
         didSetup: Bool
         pixelSize: [Int32]
         reshapePixelSize: [Int32]
         willDeinit: Bool
+        willRecreateSurface: Bool
 
 RenderComponent:
     type: component
@@ -40,6 +43,7 @@ RenderComponent:
         - didPrepareGL: renderStartTimer(RenderVM.shared!)
         - pixelSize: RenderVM.shared!.pixelSize = c.pixelSize
         - willDeinit: renderDeinit(RenderVM.shared!)
+        - willRecreateSurface: renderRecreateSurface(RenderVM.shared!)
     shoulds:
         didLaunch:
             1. Only once during the first setup:
@@ -48,6 +52,18 @@ RenderComponent:
                     c.didLaunch == false
                 then:
                     c.didLaunch = true
+        didPrepareGL:
+            1. For macOS:
+                if:
+                    c.recentField == F.didPrepareMacGL
+                then:
+                    c.didPrepareGL = true
+            2. For iOS:
+                if:
+                    c.recentField == F.didPrepareIOSGL &&
+                    !c.didPrepareGL
+                then:
+                    c.didPrepareGL = true
         pixelSize:
             1. Upon launch:
                 if:
@@ -64,3 +80,9 @@ RenderComponent:
                     c.recentField == F.backingPixelSize
                 then:
                     c.pixelSize = c.backingPixelSize
+        willRecreateSurface:
+            1. Upon resize:
+                if:
+                    c.recentField == F.reshapePixelSize
+                then:
+                    c.willRecreateSurface = true
diff --git a/ogs-blue/ver-ios/Info.plist b/ogs-blue/ver-ios/Info.plist
index 7f91849..27c69f8 100644
--- a/ogs-blue/ver-ios/Info.plist
+++ b/ogs-blue/ver-ios/Info.plist
@@ -20,6 +20,8 @@
     
     UISupportedInterfaceOrientations
     
+        UIInterfaceOrientationLandscapeLeft
+        UIInterfaceOrientationLandscapeRight
         UIInterfaceOrientationPortrait
     
 
diff --git a/ogs-blue/ver-ios/project.yml b/ogs-blue/ver-ios/project.yml
index da9deba..d5e0acf 100644
--- a/ogs-blue/ver-ios/project.yml
+++ b/ogs-blue/ver-ios/project.yml
@@ -3,13 +3,29 @@ options:
     bundleIdPrefix: org.opengamestudio
 targets:
     ogs-blue:
-        type: application
-        platform: iOS
+        dependencies:
+            - framework: .build/lib/libEGL.xcframework
+              embed: true
+            - framework: .build/lib/libGLESv2.xcframework
+              embed: true
         deploymentTarget: "15.0"
+        platform: iOS
         sources:
             - path: Assets.xcassets
             - path: src
         settings:
             base:
-                PRODUCT_BUNDLE_IDENTIFIER: org.opengamestudio.blue
+                GCC_PREPROCESSOR_DEFINITIONS:
+                    - GL_GLEXT_PROTOTYPES=1
+                    - GRAPHICS_API_OPENGL_ES3=1
+                    - PLATFORM_IOS=1
+                HEADER_SEARCH_PATHS:
+                    - "$(SRCROOT)/.build/include"
+                    - "$(SRCROOT)/.build/lib/raylib.xcframework/ios-arm64_x86_64-simulator/raylib.framework/Headers"
+                    - "$(SRCROOT)/.build/lib/raylib.xcframework/ios-arm64/raylib.framework/Headers"
                 INFOPLIST_FILE: Info.plist
+                LD_RUNPATH_SEARCH_PATHS:
+                    - "$(inherited) @executable_path/Frameworks"
+                PRODUCT_BUNDLE_IDENTIFIER: org.opengamestudio.blue
+                SWIFT_OBJC_BRIDGING_HEADER: src/BlueBridgingHeader.h
+        type: application
diff --git a/ogs-blue/ver-ios/src/AppDelegate.swift b/ogs-blue/ver-ios/src/AppDelegate.swift
index 28fa61b..b98c522 100644
--- a/ogs-blue/ver-ios/src/AppDelegate.swift
+++ b/ogs-blue/ver-ios/src/AppDelegate.swift
@@ -6,6 +6,8 @@ final class AppDelegate:
 {
     let blue = BlueComponent()
     let blueVM = BlueVM()
+    let render = RenderComponent()
+    let renderVM = RenderVM()
 
     func application(
         _ application: UIApplication,
@@ -13,6 +15,8 @@ final class AppDelegate:
     ) -> Bool {
         otherSetupConsoleLogging(blue.ctrl, "Blue")
         blue.setup()
+        otherSetupConsoleLogging(render.ctrl, "Render")
+        render.setup()
 
         return true
     }
diff --git a/ogs-blue/ver-ios/src/Blue.c b/ogs-blue/ver-ios/src/Blue.c
new file mode 100644
index 0000000..52c46a0
--- /dev/null
+++ b/ogs-blue/ver-ios/src/Blue.c
@@ -0,0 +1,15 @@
+#define EGL_CONST_IMPLEMENTATION
+#include "eglConst.h"
+
+#define EGL_IMPLEMENTATION
+#include "egl.h"
+
+#define RAYBRI_CONST_IMPLEMENTATION
+#include "raybriConst.h"
+
+#define RAYBRI_IMPLEMENTATION
+#include "raybri.h"
+
+#define RLGL_IMPLEMENTATION
+#include "rlgl.h"
+
diff --git a/ogs-blue/ver-ios/src/BlueApp.swift b/ogs-blue/ver-ios/src/BlueApp.swift
index 85682a4..d63f771 100644
--- a/ogs-blue/ver-ios/src/BlueApp.swift
+++ b/ogs-blue/ver-ios/src/BlueApp.swift
@@ -6,7 +6,11 @@ struct BlueApp: App {
 
     var body: some Scene {
         WindowGroup {
-            BlueView(appDelegate.blueVM)
+            ZStack {
+                RenderView()
+                    .ignoresSafeArea()
+                BlueView(appDelegate.blueVM)
+            }
         }
     }
 }
diff --git a/ogs-blue/ver-ios/src/BlueBridgingHeader.h b/ogs-blue/ver-ios/src/BlueBridgingHeader.h
new file mode 100644
index 0000000..2d1fc0f
--- /dev/null
+++ b/ogs-blue/ver-ios/src/BlueBridgingHeader.h
@@ -0,0 +1,7 @@
+#ifndef OGS_BLUE_BRIDGING_HEADER_H
+#define OGS_BLUE_BRIDGING_HEADER_H
+
+#include "egl/egl.h"
+#include "raybri/raybri.h"
+
+#endif // OGS_BLUE_BRIDGING_HEADER_H
diff --git a/ogs-blue/ver-ios/src/egl/egl.h b/ogs-blue/ver-ios/src/egl/egl.h
new file mode 120000
index 0000000..9cfd5c7
--- /dev/null
+++ b/ogs-blue/ver-ios/src/egl/egl.h
@@ -0,0 +1 @@
+../../../../components/egl/egl.h
\ No newline at end of file
diff --git a/ogs-blue/ver-ios/src/egl/eglConst.h b/ogs-blue/ver-ios/src/egl/eglConst.h
new file mode 120000
index 0000000..73ad711
--- /dev/null
+++ b/ogs-blue/ver-ios/src/egl/eglConst.h
@@ -0,0 +1 @@
+../../../../components/egl/eglConst.h
\ No newline at end of file
diff --git a/ogs-blue/ver-ios/src/raybri/raybri.h b/ogs-blue/ver-ios/src/raybri/raybri.h
new file mode 120000
index 0000000..daec20f
--- /dev/null
+++ b/ogs-blue/ver-ios/src/raybri/raybri.h
@@ -0,0 +1 @@
+../../../../components/raybri/raybri.h
\ No newline at end of file
diff --git a/ogs-blue/ver-ios/src/raybri/raybriConst.h b/ogs-blue/ver-ios/src/raybri/raybriConst.h
new file mode 120000
index 0000000..7e1b994
--- /dev/null
+++ b/ogs-blue/ver-ios/src/raybri/raybriConst.h
@@ -0,0 +1 @@
+../../../../components/raybri/raybriConst.h
\ No newline at end of file
diff --git a/ogs-blue/ver-ios/src/render/renderAux.swift b/ogs-blue/ver-ios/src/render/renderAux.swift
new file mode 120000
index 0000000..c244730
--- /dev/null
+++ b/ogs-blue/ver-ios/src/render/renderAux.swift
@@ -0,0 +1 @@
+../../../../components/render/ios/renderAux.swift
\ No newline at end of file
diff --git a/ogs-blue/ver-ios/src/render/renderConst.swift b/ogs-blue/ver-ios/src/render/renderConst.swift
new file mode 120000
index 0000000..d953714
--- /dev/null
+++ b/ogs-blue/ver-ios/src/render/renderConst.swift
@@ -0,0 +1 @@
+../../../../components/render/renderConst.swift
\ No newline at end of file
diff --git a/ogs-blue/ver-ios/src/render/renderEffect.swift b/ogs-blue/ver-ios/src/render/renderEffect.swift
new file mode 120000
index 0000000..725b279
--- /dev/null
+++ b/ogs-blue/ver-ios/src/render/renderEffect.swift
@@ -0,0 +1 @@
+../../../../components/render/ios/renderEffect.swift
\ No newline at end of file
diff --git a/ogs-blue/ver-ios/src/render/renderTMPIOS.swift b/ogs-blue/ver-ios/src/render/renderTMPIOS.swift
deleted file mode 100644
index da0a587..0000000
--- a/ogs-blue/ver-ios/src/render/renderTMPIOS.swift
+++ /dev/null
@@ -1,4 +0,0 @@
-func renderDeinit(_ vm: RenderVM) { }
-func renderInit(_ vm: RenderVM) { }
-func renderLoadCubeModel(_ vm: RenderVM) { }
-func renderStartTimer(_ vm: RenderVM) { }
diff --git a/ogs-blue/ver-ios/src/render/view/RenderView.swift b/ogs-blue/ver-ios/src/render/view/RenderView.swift
new file mode 120000
index 0000000..0f880a1
--- /dev/null
+++ b/ogs-blue/ver-ios/src/render/view/RenderView.swift
@@ -0,0 +1 @@
+../../../../../components/render/ios/view/RenderView.swift
\ No newline at end of file
diff --git a/ogs-blue/ver-mac/Package.swift b/ogs-blue/ver-mac/Package.swift
index 8ea77e5..8c03e0b 100644
--- a/ogs-blue/ver-mac/Package.swift
+++ b/ogs-blue/ver-mac/Package.swift
@@ -12,9 +12,11 @@ let package = Package(
     targets: [
         .target(
             name: "RaylibBridge",
-            path: "src/raybri",
-            publicHeadersPath: ".",
+            path: "src",
+            sources: ["Blue.c"],
+            publicHeadersPath: "raybri",
             cSettings: [
+                .headerSearchPath("raybri"),
                 .unsafeFlags(["-I", "\(raylibPrefix)/include"])
             ]
         ),
@@ -22,9 +24,9 @@ let package = Package(
             name: "ogs-blue",
             dependencies: ["RaylibBridge"],
             path: "src",
-            exclude: ["raybri"],
+            exclude: ["raybri", "Blue.c"],
             swiftSettings: [
-                .unsafeFlags(["-Xcc", "-DGL_SILENCE_DEPRECATION"])
+                .unsafeFlags(["-Xcc", "-DGL_SILENCE_DEPRECATION", "-Xcc", "-I\(raylibPrefix)/include"])
             ],
             linkerSettings: [
                 .unsafeFlags([
diff --git a/ogs-blue/ver-mac/src/Blue.c b/ogs-blue/ver-mac/src/Blue.c
new file mode 100644
index 0000000..2797ded
--- /dev/null
+++ b/ogs-blue/ver-mac/src/Blue.c
@@ -0,0 +1,8 @@
+#define RAYBRI_CONST_IMPLEMENTATION
+#include "raybriConst.h"
+
+#define RAYBRI_AUX_IMPLEMENTATION
+#include "raybriAux.h"
+
+#define RAYBRI_IMPLEMENTATION
+#include "raybri.h"
diff --git a/ogs-blue/ver-mac/src/dialect.swift b/ogs-blue/ver-mac/src/dialect.swift
index 19cbef9..e860d79 100644
--- a/ogs-blue/ver-mac/src/dialect.swift
+++ b/ogs-blue/ver-mac/src/dialect.swift
@@ -122,10 +122,13 @@ public struct F {
     public static let backingPixelSize = "backingPixelSize"
     public static let didLaunch = "didLaunch"
     public static let didPrepareGL = "didPrepareGL"
+    public static let didPrepareIOSGL = "didPrepareIOSGL"
+    public static let didPrepareMacGL = "didPrepareMacGL"
     public static let didSetup = "didSetup"
     public static let pixelSize = "pixelSize"
     public static let reshapePixelSize = "reshapePixelSize"
     public static let willDeinit = "willDeinit"
+    public static let willRecreateSurface = "willRecreateSurface"
 
 }
 public struct BlueContext: DialectContext {
@@ -163,10 +166,13 @@ public struct RenderContext: DialectContext {
     public var backingPixelSize = [Int32]()
     public var didLaunch = Bool()
     public var didPrepareGL = Bool()
+    public var didPrepareIOSGL = Bool()
+    public var didPrepareMacGL = Bool()
     public var didSetup = Bool()
     public var pixelSize = [Int32]()
     public var reshapePixelSize = [Int32]()
     public var willDeinit = Bool()
+    public var willRecreateSurface = Bool()
 
     public var recentField = ""
 
@@ -180,6 +186,12 @@ public struct RenderContext: DialectContext {
         else if (name == "didPrepareGL") {
             return didPrepareGL as! T
         }
+        else if (name == "didPrepareIOSGL") {
+            return didPrepareIOSGL as! T
+        }
+        else if (name == "didPrepareMacGL") {
+            return didPrepareMacGL as! T
+        }
         else if (name == "didSetup") {
             return didSetup as! T
         }
@@ -192,6 +204,9 @@ public struct RenderContext: DialectContext {
         else if (name == "willDeinit") {
             return willDeinit as! T
         }
+        else if (name == "willRecreateSurface") {
+            return willRecreateSurface as! T
+        }
 
         return "unknown-field-name" as! T
     }
@@ -209,6 +224,12 @@ public struct RenderContext: DialectContext {
         else if (name == "didPrepareGL") {
             didPrepareGL = value as! Bool
         }
+        else if (name == "didPrepareIOSGL") {
+            didPrepareIOSGL = value as! Bool
+        }
+        else if (name == "didPrepareMacGL") {
+            didPrepareMacGL = value as! Bool
+        }
         else if (name == "didSetup") {
             didSetup = value as! Bool
         }
@@ -221,6 +242,9 @@ public struct RenderContext: DialectContext {
         else if (name == "willDeinit") {
             willDeinit = value as! Bool
         }
+        else if (name == "willRecreateSurface") {
+            willRecreateSurface = value as! Bool
+        }
 
     }
 }
@@ -275,6 +299,33 @@ func renderShouldResetDidLaunch(_ c: RenderContext) -> RenderContext {
     return c
 }
 
+func renderShouldResetDidPrepareGL(_ c: RenderContext) -> RenderContext {
+    var c = c
+
+    /* 1. For macOS */
+    if
+        c.recentField == F.didPrepareMacGL
+    {
+        c.didPrepareGL = true
+        c.recentField = F.didPrepareGL
+        return c
+    }
+
+    /* 2. For iOS */
+    if
+        c.recentField == F.didPrepareIOSGL &&
+        !c.didPrepareGL
+    {
+        c.didPrepareGL = true
+        c.recentField = F.didPrepareGL
+        return c
+    }
+
+
+    c.recentField = DIALECT_CONTEXT_RECENT_FIELD_NONE
+    return c
+}
+
 func renderShouldResetPixelSize(_ c: RenderContext) -> RenderContext {
     var c = c
 
@@ -310,6 +361,23 @@ func renderShouldResetPixelSize(_ c: RenderContext) -> RenderContext {
     return c
 }
 
+func renderShouldResetWillRecreateSurface(_ c: RenderContext) -> RenderContext {
+    var c = c
+
+    /* 1. Upon resize */
+    if
+        c.recentField == F.reshapePixelSize
+    {
+        c.willRecreateSurface = true
+        c.recentField = F.willRecreateSurface
+        return c
+    }
+
+
+    c.recentField = DIALECT_CONTEXT_RECENT_FIELD_NONE
+    return c
+}
+
 func blueRegisterShoulds(_ ctrl: DialectController) {
     [
         blueShouldResetDidLaunch,
@@ -322,7 +390,9 @@ func blueRegisterShoulds(_ ctrl: DialectController) {
 func renderRegisterShoulds(_ ctrl: DialectController) {
     [
         renderShouldResetDidLaunch,
+        renderShouldResetDidPrepareGL,
         renderShouldResetPixelSize,
+        renderShouldResetWillRecreateSurface,
 
     ].forEach { f in
         ctrl.registerFunction { c in f(c as! RenderContext) }
@@ -336,6 +406,7 @@ func renderRegisterEffects(_ ctrl: DialectController) {
         F.didPrepareGL, { (c: RenderContext) in renderStartTimer(RenderVM.shared!) },
         F.pixelSize, { (c: RenderContext) in RenderVM.shared!.pixelSize = c.pixelSize },
         F.willDeinit, { (c: RenderContext) in renderDeinit(RenderVM.shared!) },
+        F.willRecreateSurface, { (c: RenderContext) in renderRecreateSurface(RenderVM.shared!) },
 
     ])
 }
diff --git a/ogs-blue/ver-mac/src/raybri/raybri.c b/ogs-blue/ver-mac/src/raybri/raybri.c
deleted file mode 120000
index 52b1940..0000000
--- a/ogs-blue/ver-mac/src/raybri/raybri.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../../components/raybri/raybri.c
\ No newline at end of file
diff --git a/ogs-blue/ver-mac/src/raybri/raybriAux.c b/ogs-blue/ver-mac/src/raybri/raybriAux.c
deleted file mode 120000
index 377245e..0000000
--- a/ogs-blue/ver-mac/src/raybri/raybriAux.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../../components/raybri/raybriAux.c
\ No newline at end of file
diff --git a/ogs-blue/ver-mac/src/raybri/raybriAux.h b/ogs-blue/ver-mac/src/raybri/raybriAux.h
index 1033d69..ebb7346 120000
--- a/ogs-blue/ver-mac/src/raybri/raybriAux.h
+++ b/ogs-blue/ver-mac/src/raybri/raybriAux.h
@@ -1 +1 @@
-../../../../components/raybri/raybriAux.h
\ No newline at end of file
+../../../../components/raybri/mac/raybriAux.h
\ No newline at end of file
diff --git a/ogs-blue/ver-mac/src/raybri/raybriConst.c b/ogs-blue/ver-mac/src/raybri/raybriConst.c
deleted file mode 120000
index fe840ed..0000000
--- a/ogs-blue/ver-mac/src/raybri/raybriConst.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../../components/raybri/raybriConst.c
\ No newline at end of file
diff --git a/ogs-blue/ver-mac/src/render/renderAux.swift b/ogs-blue/ver-mac/src/render/renderAux.swift
index 1975b82..a7dec7f 120000
--- a/ogs-blue/ver-mac/src/render/renderAux.swift
+++ b/ogs-blue/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-blue/ver-mac/src/render/renderConstMac.swift b/ogs-blue/ver-mac/src/render/renderConstMac.swift
new file mode 120000
index 0000000..b5756b0
--- /dev/null
+++ b/ogs-blue/ver-mac/src/render/renderConstMac.swift
@@ -0,0 +1 @@
+../../../../components/render/mac/renderConstMac.swift
\ No newline at end of file
diff --git a/ogs-blue/ver-mac/src/render/renderEffect.swift b/ogs-blue/ver-mac/src/render/renderEffect.swift
index d269bb5..098053c 120000
--- a/ogs-blue/ver-mac/src/render/renderEffect.swift
+++ b/ogs-blue/ver-mac/src/render/renderEffect.swift
@@ -1 +1 @@
-../../../../components/render/renderEffect.swift
\ No newline at end of file
+../../../../components/render/mac/renderEffect.swift
\ No newline at end of file
diff --git a/ogs-chkgfx/ver-mac/src/raybri/raybri.c b/ogs-chkgfx/ver-mac/src/raybri/raybri.c
index 52b1940..80f2251 120000
--- a/ogs-chkgfx/ver-mac/src/raybri/raybri.c
+++ b/ogs-chkgfx/ver-mac/src/raybri/raybri.c
@@ -1 +1 @@
-../../../../components/raybri/raybri.c
\ No newline at end of file
+../../../../components/raybri/mac/raybri.c
\ No newline at end of file
diff --git a/ogs-chkgfx/ver-mac/src/raybri/raybriAux.c b/ogs-chkgfx/ver-mac/src/raybri/raybriAux.c
new file mode 120000
index 0000000..36bd50c
--- /dev/null
+++ b/ogs-chkgfx/ver-mac/src/raybri/raybriAux.c
@@ -0,0 +1 @@
+../../../../components/raybri/mac/raybriAux.c
\ No newline at end of file
diff --git a/ogs-chkgfx/ver-mac/src/raybri/raybriAux.h b/ogs-chkgfx/ver-mac/src/raybri/raybriAux.h
new file mode 120000
index 0000000..ebb7346
--- /dev/null
+++ b/ogs-chkgfx/ver-mac/src/raybri/raybriAux.h
@@ -0,0 +1 @@
+../../../../components/raybri/mac/raybriAux.h
\ No newline at end of file
diff --git a/ogs-chkgfx/ver-mac/src/raybri/raybriConst.c b/ogs-chkgfx/ver-mac/src/raybri/raybriConst.c
index fe840ed..2656529 120000
--- a/ogs-chkgfx/ver-mac/src/raybri/raybriConst.c
+++ b/ogs-chkgfx/ver-mac/src/raybri/raybriConst.c
@@ -1 +1 @@
-../../../../components/raybri/raybriConst.c
\ No newline at end of file
+../../../../components/raybri/mac/raybriConst.c
\ No newline at end of file
diff --git a/ogs-chkgfx/ver-mac/src/raybri/raybriConst.h b/ogs-chkgfx/ver-mac/src/raybri/raybriConst.h
index 7e1b994..f834a27 120000
--- a/ogs-chkgfx/ver-mac/src/raybri/raybriConst.h
+++ b/ogs-chkgfx/ver-mac/src/raybri/raybriConst.h
@@ -1 +1 @@
-../../../../components/raybri/raybriConst.h
\ No newline at end of file
+../../../../components/raybri/mac/raybriConst.h
\ No newline at end of file
diff --git a/ogs-mahjong/ver-mac/src/raybri/raybriConst.c b/ogs-mahjong/ver-mac/src/raybri/raybriConst.c
deleted file mode 120000
index fe840ed..0000000
--- a/ogs-mahjong/ver-mac/src/raybri/raybriConst.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../../components/raybri/raybriConst.c
\ No newline at end of file
diff --git a/util/paths b/util/paths
index e69de29..eb1f91f 100644
--- a/util/paths
+++ b/util/paths
@@ -0,0 +1,3 @@
+RAYLIB_IOS="raylib-ios-xcframeworks/raylib.xcframework"
+RAYLIB_IOS_EGL="raylib-ios-xcframeworks/libEGL.xcframework"
+RAYLIB_IOS_GLES="raylib-ios-xcframeworks/libGLESv2.xcframework"
diff --git a/util/prepare-ogs-blue-ios b/util/prepare-ogs-blue-ios
index e523f01..6135231 100755
--- a/util/prepare-ogs-blue-ios
+++ b/util/prepare-ogs-blue-ios
@@ -7,5 +7,7 @@ source $SDIR/paths
 TARGET=ogs-blue
 
 STEP=0
+source $T/checkRaylibIOS $TARGET
 source $T/generateDialect $TARGET
-source $T/prepareIOS $TARGET
+source $T/prepareANGLE $TARGET
+source $T/generateIOS $TARGET
diff --git a/util/step/checkRaylibIOS b/util/step/checkRaylibIOS
new file mode 100755
index 0000000..001f4f7
--- /dev/null
+++ b/util/step/checkRaylibIOS
@@ -0,0 +1,16 @@
+#!/bin/bash -e
+
+DEP="raylib-ios-xcframeworks"
+
+STEP=$((STEP+1))
+echo -e "\n> > > > Step №$STEP. Check $DEP presence"
+
+MISSING=0
+[[ -e $SDIR/../../$RAYLIB_IOS ]] || MISSING=1
+[[ -e $SDIR/../../$RAYLIB_IOS_EGL ]] || MISSING=1
+[[ -e $SDIR/../../$RAYLIB_IOS_GLES ]] || MISSING=1
+
+if [[ $MISSING -eq 1 ]]; then
+    echo "ERROR $DEP not found alongside this project"
+    exit 1
+fi
diff --git a/util/step/prepareIOS b/util/step/generateIOS
similarity index 100%
rename from util/step/prepareIOS
rename to util/step/generateIOS
diff --git a/util/step/prepareANGLE b/util/step/prepareANGLE
new file mode 100755
index 0000000..868a4b6
--- /dev/null
+++ b/util/step/prepareANGLE
@@ -0,0 +1,22 @@
+#!/bin/bash -e
+
+TARGET=$1
+
+STEP=$((STEP+1))
+echo -e "\n> > > > Step №$STEP. Prepare ANGLE includes for '$TARGET'"
+
+BUILD=$SDIR/../$TARGET/ver-ios/.build
+INC=$BUILD/include
+LIB=$BUILD/lib
+mkdir -p $INC $LIB
+
+# Create EGL and GLES symlinks because their internal includes refer to each other
+# without knowing of XCFramework bounderies
+ln -sfn "$SDIR/../../$RAYLIB_IOS_EGL/ios-arm64_x86_64-simulator/libEGL.framework/Headers" "$INC/libEGL"
+ln -sfn "$SDIR/../../$RAYLIB_IOS_GLES/ios-arm64_x86_64-simulator/libGLESv2.framework/Headers" "$INC/libGLESv2"
+
+# Symlink libraries for convenience, too
+
+ln -sfn "$SDIR/../../$RAYLIB_IOS" "$LIB"
+ln -sfn "$SDIR/../../$RAYLIB_IOS_EGL" "$LIB"
+ln -sfn "$SDIR/../../$RAYLIB_IOS_GLES" "$LIB"