61 Commits
Author SHA1 Message Date
Михаил Капелько d11461c5ae fix icons 2026-10-30 23:37:45 +03:00
Михаил Капелько db71e37cd2 init 2026-10-30 23:29:14 +03:00
Михаил Капелько 199ec2d7b9 stub 2026-10-30 23:23:49 +03:00
Михаил Капелько c2ab69c3d0 sup table 2026-10-30 22:49:56 +03:00
Михаил Капелько ed8803dbc1 пусто 2026-10-30 22:44:45 +03:00
Михаил Капелько 325499d404 rm blue h 2026-10-30 17:15:51 +03:00
Михаил Капелько 3bcfc32ef1 move extensions loading to Aux 2026-10-30 17:05:46 +03:00
Михаил Капелько 5e5537aee6 unify 2026-10-30 16:56:50 +03:00
Михаил Капелько cd82f445d3 mirr 2026-10-30 16:35:30 +03:00
Михаил Капелько f0972f0d5b blue mac 2026-10-30 00:02:25 +03:00
Михаил Капелько f4fd8cb523 clarify 2026-10-29 23:59:05 +03:00
Михаил Капелько d4da4325f9 blue c 2026-10-29 23:51:06 +03:00
Михаил Капелько 3ab45ab003 brid h 2026-10-29 23:46:52 +03:00
Михаил Капелько 32dd0ab113 fix warning 2026-10-29 23:44:18 +03:00
Михаил Капелько b750dace76 some 2026-10-29 23:42:24 +03:00
Михаил Капелько ea68f48608 willRecreateSurface 2026-10-29 23:38:53 +03:00
Михаил Капелько de36ad782c blue 2026-10-29 23:32:04 +03:00
Михаил Капелько 7bd72fc60a attempt-1 2026-10-29 23:12:16 +03:00
Михаил Капелько 26528819a7 some 2026-10-29 23:05:04 +03:00
Михаил Капелько 360be210c2 egl cmp 2026-10-29 23:01:59 +03:00
Михаил Капелько b9b7e91bcd introduce struct 2026-10-29 17:02:28 +03:00
Михаил Капелько 6c142f794c fix layer pass 2026-10-29 16:50:02 +03:00
Михаил Капелько f76932fd91 ptr 2026-10-29 16:34:56 +03:00
Михаил Капелько 1f92c8e41c sur 2026-10-29 16:28:39 +03:00
Михаил Капелько 7b8c3181d5 pass 2026-10-29 16:25:05 +03:00
Михаил Капелько b1dd0a5107 reset sur 2026-10-29 16:18:40 +03:00
Михаил Капелько 2fbaba4a51 some 2026-10-29 16:09:18 +03:00
Михаил Капелько cc2748efb7 const 2026-10-29 16:00:23 +03:00
Михаил Капелько 9757a40b36 compact mac files 2026-10-29 15:54:55 +03:00
Михаил Капелько 48f7d37c78 single raybriEGL 2026-10-29 15:46:37 +03:00
Михаил Капелько ac649266ac clarify 2026-10-28 17:29:20 +03:00
Михаил Капелько d613f3ace1 some 2026-10-28 17:16:18 +03:00
Михаил Капелько 701e3a983a setup 2026-10-28 17:12:58 +03:00
Михаил Капелько 1dc202b1af some 2026-10-28 17:10:05 +03:00
Михаил Капелько aa541a8e23 some 2026-10-28 16:57:22 +03:00
Михаил Капелько 3f94adf13a prep 2026-10-28 16:56:50 +03:00
Михаил Капелько 2ecd15e79f oios 2026-10-28 16:47:39 +03:00
Михаил Капелько 9d6c2aeb27 prep 2026-10-28 16:46:36 +03:00
Михаил Капелько 36392764f7 sym 2026-10-28 16:28:44 +03:00
Михаил Капелько 4d639fc6b5 vm 2026-10-28 16:17:47 +03:00
Михаил Капелько 730da461c3 some 2026-10-28 16:15:56 +03:00
Михаил Капелько bfc4b22b48 build ios 2026-10-28 16:10:37 +03:00
Михаил Капелько 433afa5f9e impl 2026-10-28 16:09:30 +03:00
Михаил Капелько 7361f5c212 sm 2026-10-28 16:06:04 +03:00
Михаил Капелько e6056ae8b2 stdbool 2026-10-28 16:05:22 +03:00
Михаил Капелько 9c5b298131 ios 2026-10-28 16:00:39 +03:00
Михаил Капелько 64bb22560c preapre more ios 2026-10-28 15:57:03 +03:00
Михаил Капелько dfe16133df a few ios 2026-10-27 07:06:17 +03:00
Михаил Капелько 5a3f45dfa4 layer 2026-10-27 06:45:04 +03:00
Михаил Капелько e3844dfb18 ysm 2026-10-27 06:42:09 +03:00
Михаил Капелько 21605f98b4 raybri mac 2026-10-27 06:39:07 +03:00
Михаил Капелько 1c841a18bb embed angle into ios 2026-10-26 16:42:24 +03:00
Михаил Капелько d0b45b6b99 proj a bitr 2026-10-26 16:41:18 +03:00
Михаил Капелько cfd9f9c0af ref bin zip 2026-10-26 16:12:01 +03:00
Михаил Капелько 9101b9f5d4 some 2026-10-26 16:04:55 +03:00
Михаил Капелько 3ee51fd355 url 2026-10-26 16:03:24 +03:00
Михаил Капелько 7e511afb73 along 2026-10-26 16:02:28 +03:00
Михаил Капелько 6e5a355fc8 check for raylib ios 2026-10-26 07:11:33 +03:00
Михаил Капелько 5a875b44a8 ref 2026-10-26 06:51:45 +03:00
Михаил Капелько 4263d65090 пусто 2026-10-26 06:27:28 +03:00
kornerr 37c4e6f442 Reduce ogs-blue/ver-mac to blue background (#6) 2026-10-26 04:26:17 +01:00
140 changed files with 2419 additions and 741 deletions

No files matched your search

+115 -201
View File
@@ -1,218 +1,120 @@
# OGS Mahjong (`mj`) # OGS applications (`mj`)
A macOS SwiftUI app for **OGS Mahjong**, built on the **Dialect v4** declarative Native SwiftUI applications using the Dialect v4 declarative reactive engine.
reactive engine (see the sibling `../dialect` repo — this project is a Version: `2.0.0`. Remote: `https://git.opengamestudio.org/mahjong/mahjong`.
downstream consumer of its code generator).
Business logic lives in `dialect.yml` (YAML). A generator turns it into ## Current status
`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(...)`.
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 ## Source layout
> bolted on: the Mahjong game logic has not been written yet. The app shell,
> packaging, symlink wiring and the raylib renderer are in place.
## Structure - `<app>/dialect.yml`: per-application logic; generates
`<app>/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.
``` ## Graphics ownership and platform differences
dialect.yml Single source of truth for the reactive logic.
Generates game/ver-mac/src/dialect.swift
components/ SHARED source-of-truth for all components. Every GPU operation requires its context current on the calling thread.
other/other.swift Shared helpers (otherPrintStderr, otherWriteFile, `rlLoadExtensions` also requires an existing current context; it precedes
otherSetupConsoleLogging, ...) `rlglInit`, not native context creation.
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
game/ver-mac/ macOS app (SPM executable target "ogs-mahjong") macOS uses `NSOpenGLView` (OpenGL 3.2 Core). `renderInit` makes its context
Package.swift SPM manifest (macOS 13+, swift-tools 5.9); C target current, enables VSync, loads extensions with the C loader callback and starts
"RaylibBridge" (path src/raybri, publicHeadersPath ".") + raylib. The timer requests `needsDisplay`; `draw(_:)` forwards to `renderDraw`,
links Homebrew raylib; the Swift target excludes raybri which activates the context, renders and presents via `flushBuffer`.
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/...
ref/swiftraylib Symlink to ../../swiftraylib — the raylib/SwiftUI Blue's SPM `RaylibBridge` target compiles `src/Blue.c`, exposes headers in
renderer sample the game will use for 3D rendering. `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) On iOS, UIKit owns the view/layer and `RenderGLView.st` owns an `EGLState`.
paths APP_MAC = .build/OGS Mahjong.app Swift effects create EGL/ANGLE state and surface, make the context current,
build-mac generateDialect -> buildMac -> packageMac and initialize raylib. Timer ticks call rendering directly; presentation uses
run-mac runMac `eglSwapBuffers`. Pixel sizes come from view bounds and content scale.
rm-mac-geom Resets saved window geometry Dialect's resize event triggers `renderRecreateSurface`; the macOS helper is
step/ Sourced steps: generateDialect, buildMac, intentionally a no-op. Teardown must stop the timer, activate the context,
packageMac, runMac release rlgl resources, then destroy EGL surface/context/display resources.
history/gitjs/ GitJS "Glavred" history + the original JS source of the Blue iOS uses `src/BlueBridgingHeader.h` to expose C APIs to Swift. `Blue.c`
web Mahjong, kept for reference — not part of the build. 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 macOS build scripts generate Dialect, run `swift build`, and package resources
directories whose files are **relative symlinks** back into `components/`: from `ver-mac/res/` into `ver-mac/.build/<App Name>.app`. iOS preparation checks
XCFrameworks, generates Dialect, stages ANGLE include/library symlinks in
`ver-ios/.build/`, then runs XcodeGen. Build Blue for Simulator with:
``` ```sh
src/other/other.swift -> ../../../../components/other/other.swift (4 up) xcodebuild -project 'ogs-blue/ver-ios/OGS blue.xcodeproj' -scheme ogs-blue \
src/raybri/raybri.c -> ../../../../components/raybri/raybri.c (4 up) -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' \
src/raybri/raybri.h -> ../../../../components/raybri/raybri.h (4 up) CODE_SIGNING_ALLOWED=NO build
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)
``` ```
SPM silently **skips** a dangling symlink (no error), so after moving Audit dangling source symlinks after moves (SPM can silently skip them):
`components/` or a subdir, audit for broken links:
```bash ```sh
find . -type l ! -exec test -e {} \; -not -path './.build/*' 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 ## Editing the dialect
- Add/modify contexts and components in `dialect.yml`, then run - Add/modify contexts and components in `<app>/dialect.yml`, then run
`util/build-mac` to regenerate `dialect.swift`. `util/build-<app>-mac` to regenerate `dialect.swift`.
- **Chicken-egg**: `struct F` (field-name constants) lives only in the - **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 `<app>/dialect.yml`
requires hand-patching its `static let <field> = "<field>"` into `struct F` requires hand-patching its `static let <field> = "<field>"` into `struct F`
in `dialect.swift` (ASCII-alphabetical order) if you cannot regenerate first, in `dialect.swift` (ASCII-alphabetical order) if you cannot regenerate first,
otherwise the build fails on `F.<field>` being unresolved. otherwise the build fails on `F.<field>` being unresolved.
- `dialect.swift` is generated — edits there are overwritten on the next - `dialect.swift` is generated — edits there are overwritten on the next
`util/build-mac`. Change the source (`dialect.yml` / `components/`) instead. `util/build-<app>-mac`. Change the source (`<app>/dialect.yml` / `components/`) instead.
- **Validate `dialect.yml` after edits** (e.g. `ruby -ryaml -e 'YAML.load_file("dialect.yml")'`). - **Validate `<app>/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 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 parser (`components/yml/ymlFun.swift`) blindly `dropLast()`s it, so a missing
colon silently eats the label's last character in the generated `about` colon silently eats the label's last character in the generated `about`
@@ -235,6 +137,22 @@ Do not flip it on without addressing those.
## Conventions ## Conventions
- When generating or mirroring Swift/iOS code into Android, stay as close to
the Swift original as possible: preserve naming, capitalization, visible text,
layout, styling, behavior and structure. Use the closest platform equivalent
where a direct translation is unavailable; avoid unrelated redesigns or
Android-specific changes unless requested. In particular, use `OGS blue`
(not `OGS Blue`) for the Android project name and app labels, matching iOS.
- Android Compose typography: prefer named `MaterialTheme.typography` styles
over explicit numeric `fontSize` values. Use `headlineLarge` for Blue's title
as the counterpart to SwiftUI's `.largeTitle`, on both overlaid text layers.
- Android Kotlin imports: use wildcard imports (`package.*`) when importing
multiple declarations from the same package, including newly generated imports.
Keep single imports and aliases explicit where needed to avoid name conflicts.
Wildcards do not include subpackages; import those separately.
- `game/ver-mac/.build/`, `build/`, `.DS_Store`, Xcode/Gradle artifacts are - `game/ver-mac/.build/`, `build/`, `.DS_Store`, Xcode/Gradle artifacts are
git-ignored. git-ignored.
- Prefer editing files in `components/` (the real files); the `src/` entries are - Prefer editing files in `components/` (the real files); the `src/` entries are
@@ -246,17 +164,13 @@ Do not flip it on without addressing those.
- Never call raylib / `raybri_*` without making the view's GL context current first - Never call raylib / `raybri_*` without making the view's GL context current first
(see the GL context rule above). (see the GL context rule above).
## Skill: source-file study documents ## Source 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/<FileName>.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.
- 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.
+14 -2
View File
@@ -1,5 +1,17 @@
## Targets
| № | Target | macOS | iOS/iPadOS | Android |
| 1 | ogs-blue | √ | √ | ? |
## Prerequisites ## Prerequisites
* macOS ### macOS
`brew install raylib` * `brew install raylib`
### iOS
* `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
+14
View File
@@ -0,0 +1,14 @@
package org.opengamestudio
object BlueComponent {
val ctrl = DialectController(BlueContext())
init {
blueRegisterEffects(ctrl)
blueRegisterShoulds(ctrl)
}
fun setup() {
blueSet(F.didSetup, true)
}
}
+31
View File
@@ -0,0 +1,31 @@
package org.opengamestudio
import androidx.compose.foundation.layout.*
import androidx.compose.material3.*
import androidx.compose.runtime.Composable
import androidx.compose.ui.*
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
@Composable
fun BlueView() {
Column(
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(16.dp),
modifier = Modifier.padding(40.dp)
) {
Box(contentAlignment = Alignment.Center) {
Text(
text = "Blue",
style = MaterialTheme.typography.headlineLarge,
color = Color.White,
modifier = Modifier.offset(x = 1.dp, y = 1.dp)
)
Text(
text = "Blue",
style = MaterialTheme.typography.headlineLarge,
color = Color.Black
)
}
}
}
+14
View File
@@ -0,0 +1,14 @@
class BlueComponent {
let ctrl = DialectController(BlueContext())
static private(set) weak var singleton: BlueComponent?
init() {
Self.singleton = self
//blueRegisterEffects(ctrl)
blueRegisterShoulds(ctrl)
}
func setup() {
blueSet(F.didSetup, true)
}
}
+9
View File
@@ -0,0 +1,9 @@
import Combine
final class BlueVM: ObservableObject {
static private(set) weak var shared: BlueVM?
init() {
Self.shared = self
}
}
+1
View File
@@ -0,0 +1 @@
../../mac/view/BlueView.swift
+24
View File
@@ -0,0 +1,24 @@
import SwiftUI
struct BlueView: View {
@ObservedObject var vm: BlueVM
init(_ vm: BlueVM) {
self.vm = vm
}
var body: some View {
VStack(spacing: 16) {
ZStack {
Text("Blue")
.font(.largeTitle)
.foregroundStyle(.white)
.offset(x: 1, y: 1)
Text("Blue")
.font(.largeTitle)
.foregroundStyle(.black)
}
}
.padding(40)
}
}
+1
View File
@@ -0,0 +1 @@
../../mac/view/ChkgfxView.swift
+87
View File
@@ -0,0 +1,87 @@
#ifndef EGL_H
#define EGL_H
#include "eglConst.h"
#include <libEGL/libEGL.h>
#include <libGLESv2/GLES/gl.h>
#include <stdbool.h>
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
+33
View File
@@ -0,0 +1,33 @@
#ifndef EGL_CONST_H
#define EGL_CONST_H
#include <libEGL/libEGL.h>
// 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
+16
View File
@@ -0,0 +1,16 @@
package org.opengamestudio
fun otherPrintStderr(txt: String) {
System.err.println(txt)
}
fun otherSetupConsoleLogging(
ctrl: DialectController,
prefix: String
) {
ctrl.registerCallback { c ->
val value = c.fieldAny(c.recentField)
val line = "ИГР $prefix k/v: '${c.recentField}'/'$value'"
otherPrintStderr(line)
}
}
+41
View File
@@ -0,0 +1,41 @@
#ifndef RAYBRI_AUX_H
#define RAYBRI_AUX_H
// Header
void *raybriGLLoader(const char *name);
void raybriLoadExtensions(void);
// Source
#if defined(RAYBRI_AUX_IMPLEMENTATION)
#include <dlfcn.h>
#include "raybriConst.h"
#include "rlgl.h"
#include <stddef.h>
// raylib is built as a static/dynamic library with GLFW baked in, but we never
// call InitWindow(). Instead we render into an OpenGL context owned by the
// macOS app, so we must supply the OpenGL entry point loader ourselves.
void *raybriGLLoader(const char *name) {
static void *handle = NULL;
if (handle == NULL) {
handle = dlopen(RAYBRI_MAC_GL, RTLD_LAZY | RTLD_LOCAL);
}
if (handle == NULL) {
return NULL;
}
return dlsym(handle, name);
}
void raybriLoadExtensions(void) {
rlLoadExtensions(raybriGLLoader);
}
#endif // RAYBRI_AUX_IMPLEMENTATION
#endif // RAYBRI_AUX_H
-440
View File
@@ -1,440 +0,0 @@
#include "raybri.h"
#include "raylib.h"
#include "rlgl.h"
#include "raymath.h"
#include <dlfcn.h>
#include <math.h>
#include <stddef.h>
#include <stdio.h>
#include <string.h>
static int sr_width = 1;
static int sr_height = 1;
// Render configuration supplied by the application (see renderConst.swift).
static raybri_config sr_cfg = { 0 };
// Cube transform (driven by the application, Euler degrees).
static float sr_rot_x = 0.0f;
static float sr_rot_y = 0.0f;
static float sr_rot_z = 0.0f;
static int sr_ready = 0;
static Model sr_model = { 0 };
static int sr_has_model = 0;
static Material sr_cube_material = { 0 };
static Material sr_cube_shadow_material = { 0 };
static Texture2D sr_cube_normal = { 0 };
static Model sr_ground_model = { 0 };
static Material sr_ground_material = { 0 };
static Material sr_ground_shadow_material = { 0 };
static Shader sr_main_shader = { 0 };
static Shader sr_shadow_shader = { 0 };
static int sr_shadow_fbo = 0;
static unsigned int sr_shadow_color = 0;
static unsigned int sr_shadow_depth = 0;
static Matrix sr_light_view = { 0 };
static Matrix sr_light_proj = { 0 };
static Vector3 sr_light_pos = { 0.0f, 0.0f, 0.0f };
// Main shader uniform locations
static int loc_light_pos = -1;
static int loc_light_color = -1;
static int loc_ambient = -1;
static int loc_light_enabled = -1;
static int loc_emissive = -1;
static int loc_albedo_color = -1;
static int loc_shadow_map = -1;
static int loc_shadow_bias = -1;
static int loc_shadow_softness = -1;
static int loc_normal_map = -1;
static int loc_normal_strength = -1;
static int loc_light_mvp = -1;
static int loc_is_ground = -1;
static int loc_grid_color = -1;
static int loc_camera_pos = -1;
static int loc_fog_color = -1;
static int loc_fog_start = -1;
static int loc_fog_end = -1;
// raylib is built as a static/dynamic library with GLFW baked in, but we never
// call InitWindow(). Instead we render into an OpenGL context owned by the
// macOS app, so we must supply the OpenGL entry point loader ourselves.
static void *sr_gl_loader(const char *name)
{
static void *handle = NULL;
if (handle == NULL)
{
handle = dlopen("/System/Library/Frameworks/OpenGL.framework/OpenGL", RTLD_LAZY | RTLD_LOCAL);
}
if (handle == NULL) return NULL;
return dlsym(handle, name);
}
// Compose a model transform exactly like raylib's DrawModel() does, so the
// matrices we feed to DrawMesh() match what rlgl computes internally.
static Matrix sr_transform(Vector3 pos, float scale, float rx, float ry, float rz)
{
Matrix mat_scale = MatrixScale(scale, scale, scale);
Matrix mat_rotation = MatrixRotateXYZ((Vector3){ rx * DEG2RAD, ry * DEG2RAD, rz * DEG2RAD });
Matrix mat_translation = MatrixTranslate(pos.x, pos.y, pos.z);
return MatrixMultiply(MatrixMultiply(mat_scale, mat_rotation), mat_translation);
}
static void sr_load_shaders(const char *main_vs, const char *main_fs,
const char *shadow_vs, const char *shadow_fs)
{
sr_main_shader = LoadShaderFromMemory(main_vs, main_fs);
sr_shadow_shader = LoadShaderFromMemory(shadow_vs, shadow_fs);
loc_light_pos = GetShaderLocation(sr_main_shader, "u_lightPos");
loc_light_color = GetShaderLocation(sr_main_shader, "u_lightColor");
loc_ambient = GetShaderLocation(sr_main_shader, "u_ambient");
loc_light_enabled = GetShaderLocation(sr_main_shader, "u_lightEnabled");
loc_emissive = GetShaderLocation(sr_main_shader, "u_emissive");
loc_albedo_color = GetShaderLocation(sr_main_shader, "u_albedoColor");
loc_shadow_map = GetShaderLocation(sr_main_shader, "u_shadowMap");
loc_shadow_bias = GetShaderLocation(sr_main_shader, "u_shadowBias");
loc_shadow_softness = GetShaderLocation(sr_main_shader, "u_shadowSoftness");
loc_normal_map = GetShaderLocation(sr_main_shader, "u_normalMap");
loc_normal_strength = GetShaderLocation(sr_main_shader, "u_normalStrength");
loc_light_mvp = GetShaderLocation(sr_main_shader, "u_lightMVP");
loc_is_ground = GetShaderLocation(sr_main_shader, "u_isGround");
loc_grid_color = GetShaderLocation(sr_main_shader, "u_gridColor");
loc_camera_pos = GetShaderLocation(sr_main_shader, "u_cameraPos");
loc_fog_color = GetShaderLocation(sr_main_shader, "u_fogColor");
loc_fog_start = GetShaderLocation(sr_main_shader, "u_fogStart");
loc_fog_end = GetShaderLocation(sr_main_shader, "u_fogEnd");
// Build a framebuffer whose depth attachment is a sampleable TEXTURE (raylib's
// LoadRenderTexture() uses a non-sampleable renderbuffer, so we build it by hand).
sr_shadow_fbo = rlLoadFramebuffer();
sr_shadow_color = rlLoadTexture(NULL, sr_cfg.shadow_size, sr_cfg.shadow_size, RL_PIXELFORMAT_UNCOMPRESSED_R8G8B8A8, 1);
sr_shadow_depth = rlLoadTextureDepth(sr_cfg.shadow_size, sr_cfg.shadow_size, false);
rlEnableFramebuffer(sr_shadow_fbo);
rlFramebufferAttach(sr_shadow_fbo, sr_shadow_color, RL_ATTACHMENT_COLOR_CHANNEL0, RL_ATTACHMENT_TEXTURE2D, 0);
rlFramebufferAttach(sr_shadow_fbo, sr_shadow_depth, RL_ATTACHMENT_DEPTH, RL_ATTACHMENT_TEXTURE2D, 0);
int shadow_ok = rlFramebufferComplete(sr_shadow_fbo);
fprintf(stderr, "SR: shadow framebuffer %s\n", shadow_ok ? "complete" : "INCOMPLETE");
rlDisableFramebuffer();
}
static void sr_build_ground(void)
{
Mesh ground_mesh = GenMeshPlane(sr_cfg.ground_size, sr_cfg.ground_size, 1, 1);
sr_ground_model = LoadModelFromMesh(ground_mesh);
sr_ground_material = LoadMaterialDefault();
sr_ground_material.shader = sr_main_shader;
sr_ground_shadow_material = LoadMaterialDefault();
sr_ground_shadow_material.shader = sr_shadow_shader;
}
// Uniforms that never change between frames are uploaded once at startup.
// SetShaderValue() is a bare glUniform*(), so the program must be bound.
static void sr_config_shaders(void)
{
sr_light_pos = (Vector3){ 0.0f, 4.2f, 0.0f };
Vector3 light_color = { 1.15f, 1.08f, 0.98f };
Vector3 ambient = { 0.30f, 0.32f, 0.38f };
Vector3 grid_color = { 0.45f, 0.62f, 0.95f };
Vector3 fog_color = { 24.0f / 255.0f, 26.0f / 255.0f, 34.0f / 255.0f };
Vector3 camera_pos = { 0.0f, 2.6f, 5.6f };
float albedo[3] = { 1.0f, 1.0f, 1.0f };
float light_amount = 1.0f;
float shadow_bias = 0.0025f;
float shadow_softness = 4.0f;
float fog_start = 10.0f;
float fog_end = 34.0f;
int shadow_unit = 1;
int normal_unit = 2;
rlEnableShader(sr_main_shader.id);
SetShaderValue(sr_main_shader, loc_light_pos, &sr_light_pos, SHADER_UNIFORM_VEC3);
SetShaderValue(sr_main_shader, loc_light_color, &light_color, SHADER_UNIFORM_VEC3);
SetShaderValue(sr_main_shader, loc_ambient, &ambient, SHADER_UNIFORM_VEC3);
SetShaderValue(sr_main_shader, loc_light_enabled, &light_amount, SHADER_UNIFORM_FLOAT);
SetShaderValue(sr_main_shader, loc_shadow_bias, &shadow_bias, SHADER_UNIFORM_FLOAT);
SetShaderValue(sr_main_shader, loc_shadow_softness, &shadow_softness, SHADER_UNIFORM_FLOAT);
SetShaderValue(sr_main_shader, loc_grid_color, &grid_color, SHADER_UNIFORM_VEC3);
SetShaderValue(sr_main_shader, loc_camera_pos, &camera_pos, SHADER_UNIFORM_VEC3);
SetShaderValue(sr_main_shader, loc_fog_color, &fog_color, SHADER_UNIFORM_VEC3);
SetShaderValue(sr_main_shader, loc_fog_start, &fog_start, SHADER_UNIFORM_FLOAT);
SetShaderValue(sr_main_shader, loc_fog_end, &fog_end, SHADER_UNIFORM_FLOAT);
SetShaderValue(sr_main_shader, loc_albedo_color, albedo, SHADER_UNIFORM_VEC3);
SetShaderValue(sr_main_shader, loc_shadow_map, &shadow_unit, SHADER_UNIFORM_INT);
SetShaderValue(sr_main_shader, loc_normal_map, &normal_unit, SHADER_UNIFORM_INT);
rlDisableShader();
}
void raybri_init(
const char *main_vs,
const char *main_fs,
const char *shadow_vs,
const char *shadow_fs,
raybri_config config
) {
sr_cfg = config;
// raylib's default INFO logging is noisy; keep warnings and errors only.
SetTraceLogLevel(LOG_WARNING);
rlLoadExtensions((void *)sr_gl_loader);
// Init with default 1x1 size
rlglInit(1, 1);
sr_load_shaders(main_vs, main_fs, shadow_vs, shadow_fs);
sr_config_shaders();
sr_build_ground();
sr_ready = 1;
}
void raybri_load_model(const char *gltf_path)
{
if (!sr_ready || gltf_path == NULL) return;
sr_model = LoadModel(gltf_path);
sr_has_model = (sr_model.meshCount > 0);
// The matching normal map sits next to the glTF; load it separately.
char asset_dir[1024];
const char *slash = strrchr(gltf_path, '/');
size_t dir_len = (slash != NULL) ? (size_t)(slash - gltf_path + 1) : 0;
snprintf(asset_dir, sizeof(asset_dir), "%.*s", (int)dir_len, gltf_path);
if (sr_has_model)
{
int cube_mat_index = (sr_model.materialCount > 0) ? sr_model.meshMaterial[0] : 0;
sr_cube_material = sr_model.materials[cube_mat_index];
sr_cube_material.shader = sr_main_shader;
Texture2D base_tex = sr_cube_material.maps[MATERIAL_MAP_DIFFUSE].texture;
SetTextureFilter(base_tex, TEXTURE_FILTER_BILINEAR);
SetTextureWrap(base_tex, TEXTURE_WRAP_CLAMP);
char normal_path[1024];
snprintf(normal_path, sizeof(normal_path), "%scube_normal.png", asset_dir);
if (FileExists(normal_path))
{
sr_cube_normal = LoadTexture(normal_path);
SetTextureFilter(sr_cube_normal, TEXTURE_FILTER_BILINEAR);
SetTextureWrap(sr_cube_normal, TEXTURE_WRAP_CLAMP);
}
sr_cube_shadow_material = sr_cube_material;
sr_cube_shadow_material.shader = sr_shadow_shader;
}
else
{
fprintf(stderr, "SR: failed to load model: %s\n", gltf_path);
}
}
void raybri_resize(int width, int height)
{
if (width > 0) sr_width = width;
if (height > 0) sr_height = height;
}
void raybri_set_rotation(float x_deg, float y_deg, float z_deg)
{
sr_rot_x = x_deg;
sr_rot_y = y_deg;
sr_rot_z = z_deg;
}
static Matrix sr_cube_transform(void)
{
return sr_transform((Vector3){ 0.0f, 1.1f, 0.0f }, 1.0f, sr_rot_x, sr_rot_y, sr_rot_z);
}
static void sr_draw_object(Model model, Material material, Matrix model_mat,
Texture2D normal, float is_ground, float emissive);
static void sr_render_main_pass(void)
{
// --- Main pass: camera ---
rlViewport(0, 0, sr_width, sr_height);
rlSetFramebufferWidth(sr_width);
rlSetFramebufferHeight(sr_height);
rlClearColor(24, 26, 34, 255);
rlClearScreenBuffers();
rlMatrixMode(RL_PROJECTION);
rlPushMatrix();
rlLoadIdentity();
float aspect = (float)sr_width / (float)sr_height;
double top = (double)sr_cfg.near_plane * tan((double)sr_cfg.fov_y * 0.5 * DEG2RAD);
double right = top * (double)aspect;
rlFrustum(-right, right, -top, top, (double)sr_cfg.near_plane, (double)sr_cfg.far_plane);
rlMatrixMode(RL_MODELVIEW);
rlLoadIdentity();
Vector3 eye = { 0.0f, 2.6f, 5.6f };
Vector3 target = { 0.0f, 1.0f, 0.0f };
Vector3 up = { 0.0f, 1.0f, 0.0f };
Matrix view = MatrixLookAt(eye, target, up);
rlMultMatrixf(MatrixToFloat(view));
rlEnableDepthTest();
rlEnableBackfaceCulling();
rlSetCullFace(RL_CULL_FACE_BACK);
rlEnableShader(sr_main_shader.id);
rlActiveTextureSlot(1);
rlEnableTexture(sr_shadow_depth);
rlActiveTextureSlot(0);
// --- Ground (procedural grid floor) ---
sr_draw_object(sr_ground_model, sr_ground_material, MatrixTranslate(0.0f, 0.0f, 0.0f), (Texture2D){ 0 }, 1.0f, 0.0f);
// --- Cubes ---
if (sr_has_model)
{
sr_draw_object(sr_model, sr_cube_material, sr_cube_transform(), sr_cube_normal, 0.0f, 0.0f);
}
// Flush while the projection/modelview matrices are still active, otherwise
// rlgl draws the pending batch with the restored (2D) projection.
rlDrawRenderBatchActive();
// --- Restore matrices (equivalent to raylib's EndMode3D) ---
rlMatrixMode(RL_PROJECTION);
rlPopMatrix();
rlMatrixMode(RL_MODELVIEW);
rlLoadIdentity();
rlDisableDepthTest();
rlDisableBackfaceCulling();
}
static void sr_render_shadow_pass(void)
{
rlViewport(0, 0, sr_cfg.shadow_size, sr_cfg.shadow_size);
rlSetFramebufferWidth(sr_cfg.shadow_size);
rlSetFramebufferHeight(sr_cfg.shadow_size);
rlEnableFramebuffer(sr_shadow_fbo);
rlClearColor(255, 255, 255, 255);
rlClearScreenBuffers();
rlEnableDepthTest();
rlEnableBackfaceCulling();
rlSetCullFace(RL_CULL_FACE_FRONT);
rlMatrixMode(RL_PROJECTION);
rlPushMatrix();
rlLoadIdentity();
rlMultMatrixf(MatrixToFloat(sr_light_proj));
rlMatrixMode(RL_MODELVIEW);
rlLoadIdentity();
rlMultMatrixf(MatrixToFloat(sr_light_view));
if (sr_has_model)
{
DrawMesh(sr_model.meshes[0], sr_cube_shadow_material, sr_cube_transform());
}
rlDrawRenderBatchActive();
rlMatrixMode(RL_PROJECTION);
rlPopMatrix();
rlSetCullFace(RL_CULL_FACE_BACK);
rlDisableFramebuffer();
rlViewport(0, 0, sr_width, sr_height);
rlSetFramebufferWidth(sr_width);
rlSetFramebufferHeight(sr_height);
rlDisableDepthTest();
}
static void sr_set_light_mvp(Matrix model)
{
Matrix light_mvp = MatrixMultiply(MatrixMultiply(model, sr_light_view), sr_light_proj);
SetShaderValueMatrix(sr_main_shader, loc_light_mvp, light_mvp);
}
static void sr_bind_normal(Texture2D tex)
{
rlActiveTextureSlot(2);
if (tex.id > 0) rlEnableTexture(tex.id);
rlActiveTextureSlot(0);
}
static void sr_draw_object(Model model, Material material, Matrix model_mat,
Texture2D normal, float is_ground, float emissive)
{
sr_set_light_mvp(model_mat);
float normal_strength = (normal.id > 0) ? 1.0f : 0.0f;
SetShaderValue(sr_main_shader, loc_emissive, &emissive, SHADER_UNIFORM_FLOAT);
SetShaderValue(sr_main_shader, loc_is_ground, &is_ground, SHADER_UNIFORM_FLOAT);
SetShaderValue(sr_main_shader, loc_normal_strength, &normal_strength, SHADER_UNIFORM_FLOAT);
sr_bind_normal(normal);
DrawMesh(model.meshes[0], material, model_mat);
}
void raybri_render(void)
{
if (!sr_ready) return;
rlDrawRenderBatchActive();
// --- Light (point light above the scene) ---
Vector3 light_target = (Vector3){ 0.0f, -2.0f, 0.0f };
Vector3 light_up = (Vector3){ 0.0f, 0.0f, -1.0f };
sr_light_view = MatrixLookAt(sr_light_pos, light_target, light_up);
sr_light_proj = MatrixPerspective(90.0 * DEG2RAD, 1.0, 1.5, 16.0);
sr_render_shadow_pass();
sr_render_main_pass();
}
void raybri_shutdown(void)
{
if (!sr_ready) return;
if (sr_has_model)
{
UnloadModel(sr_model);
sr_has_model = 0;
}
UnloadModel(sr_ground_model);
if (sr_cube_normal.id > 0)
{
UnloadTexture(sr_cube_normal);
sr_cube_normal.id = 0;
}
if (sr_shadow_color > 0) rlUnloadTexture(sr_shadow_color);
if (sr_shadow_depth > 0) rlUnloadTexture(sr_shadow_depth);
if (sr_shadow_fbo > 0) rlUnloadFramebuffer(sr_shadow_fbo);
if (sr_main_shader.id > 0) UnloadShader(sr_main_shader);
if (sr_shadow_shader.id > 0) UnloadShader(sr_shadow_shader);
rlglClose();
sr_ready = 0;
}
+33 -37
View File
@@ -1,46 +1,42 @@
#ifndef OGS_MAHJONG_RAYLIB_BRIDGE_H #ifndef RAYBRI_H
#define OGS_MAHJONG_RAYLIB_BRIDGE_H #define RAYBRI_H
#ifdef __cplusplus // Header
extern "C" {
#endif
// Render configuration, sourced from renderConst.swift. void raybriInit(void);
typedef struct raybri_config { void raybriRender(int width, int height);
float fov_y; // vertical field of view (degrees) void raybriShutdown(void);
float near_plane; // camera near plane
float far_plane; // camera far plane
int shadow_size; // shadow map resolution (px)
float ground_size; // ground plane extent
} raybri_config;
// Initialise the OpenGL-backed raylib scene (no raylib window is created). // Source
// The four shader sources come from renderConstShader.swift.
void raybri_init(
const char *main_vs,
const char *main_fs,
const char *shadow_vs,
const char *shadow_fs,
raybri_config config
);
// Load the textured cube glTF model. #if defined(RAYBRI_IMPLEMENTATION)
void raybri_load_model(const char *gltf_path);
// Resize the viewport. #include "rlgl.h"
void raybri_resize(int width, int height);
// Cube rotation, driven by the application (Euler angles, degrees). void raybriInit(void) {
void raybri_set_rotation(float x_deg, float y_deg, float z_deg); //SetTraceLogLevel(LOG_WARNING);
// Render one frame. // Initialize raylib graphics layer with a placeholder 1x1 framebuffer size
void raybri_render(void); // Graphics layer includes default texture, shader, render batch and OpenGL state
rlglInit(1, 1);
// Release all GPU resources. // Background is painted in blue
void raybri_shutdown(void); rlClearColor(0, 0, 255, 255);
#ifdef __cplusplus
} }
#endif
#endif 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
+16
View File
@@ -0,0 +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
+19
View File
@@ -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)
}
+43
View File
@@ -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)
}
@@ -0,0 +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)
}
}
@@ -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) {}
}
@@ -3,12 +3,7 @@ import RaylibBridge
func renderDraw(_ vm: RenderVM) { func renderDraw(_ vm: RenderVM) {
vm.glView.openGLContext?.makeCurrentContext() vm.glView.openGLContext?.makeCurrentContext()
raybriRender(vm.pixelSize[0], vm.pixelSize[1])
raybri_resize(vm.pixelSize[0], vm.pixelSize[1])
let t = Float(CACurrentMediaTime() - vm.startTime)
raybri_set_rotation(t * 6.0, t * 18.0, 0.0)
raybri_render()
vm.glView.openGLContext?.flushBuffer() vm.glView.openGLContext?.flushBuffer()
} }
@@ -18,3 +13,7 @@ func renderPixelSize(_ view: NSView) -> [Int32] {
let h = Int32(max(1, backing.height)) let h = Int32(max(1, backing.height))
return [w, h] return [w, h]
} }
func renderRecreateSurface(_ vm: RenderVM) {
// No-op on macOS
}
@@ -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
]
@@ -3,10 +3,10 @@ import RaylibBridge
import QuartzCore import QuartzCore
func renderDeinit(_ vm: RenderVM) { func renderDeinit(_ vm: RenderVM) {
print("ИГР renderD")
vm.timer?.invalidate() vm.timer?.invalidate()
vm.timer = nil
vm.glView.openGLContext?.makeCurrentContext() vm.glView.openGLContext?.makeCurrentContext()
raybri_shutdown() raybriShutdown()
} }
func renderInit(_ vm: RenderVM) { func renderInit(_ vm: RenderVM) {
@@ -16,20 +16,8 @@ func renderInit(_ vm: RenderVM) {
var swapInterval: Int32 = 1 var swapInterval: Int32 = 1
vm.glView.openGLContext?.setValues(&swapInterval, for: .swapInterval) vm.glView.openGLContext?.setValues(&swapInterval, for: .swapInterval)
// Init Raylib raybriLoadExtensions()
raybri_init( raybriInit()
RENDER_SHADER_MAIN_VS,
RENDER_SHADER_MAIN_FS,
RENDER_SHADER_SHADOW_VS,
RENDER_SHADER_SHADOW_FS,
RENDER_CONFIG
)
}
func renderLoadCubeModel(_ vm: RenderVM) {
let path = Bundle.main.resourceURL!.path + RENDER_MODEL_CUBE
vm.glView.openGLContext?.makeCurrentContext()
raybri_load_model(path)
} }
func renderStartTimer(_ vm: RenderVM) { func renderStartTimer(_ vm: RenderVM) {
+12 -12
View File
@@ -15,9 +15,20 @@ final class RenderGLView: NSOpenGLView {
fatalError("init(coder:) has not been implemented") 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() { override func prepareOpenGL() {
super.prepareOpenGL() super.prepareOpenGL()
renderSet(F.didPrepareGL, true) renderSet(F.didPrepareMacGL, true)
} }
override func reshape() { override func reshape() {
@@ -33,15 +44,4 @@ final class RenderGLView: NSOpenGLView {
let ps = renderPixelSize(self) let ps = renderPixelSize(self)
renderSet(F.backingPixelSize, ps) renderSet(F.backingPixelSize, ps)
} }
override func draw(_ dirtyRect: NSRect) {
let vm = RenderVM.shared!
if vm.didPrepareGL {
renderDraw(vm)
}
}
deinit {
renderSet(F.willDeinit, true)
}
} }
@@ -1,7 +1,6 @@
import AppKit import AppKit
import SwiftUI import SwiftUI
/// Render view for SwiftUI
struct RenderView: NSViewRepresentable { struct RenderView: NSViewRepresentable {
func makeNSView(context: Context) -> RenderGLView { func makeNSView(context: Context) -> RenderGLView {
RenderVM.shared!.glView RenderVM.shared!.glView
-22
View File
@@ -1,24 +1,2 @@
import AppKit
import RaylibBridge
let RENDER_CONFIG = raybri_config(
fov_y: 45.0,
near_plane: 0.1,
far_plane: 1000.0,
shadow_size: 256,
ground_size: 40.0
)
let RENDER_FPS = 60.0 let RENDER_FPS = 60.0
let RENDER_MODEL_CUBE = "/cube/cube.gltf" 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
]
+68
View File
@@ -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 `<pre><code>`, `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.
+88
View File
@@ -0,0 +1,88 @@
version: 4
output:
ver-mac/src/dialect.swift:
type: swift
BlueContext:
type: context
fields:
didLaunch: Bool
didSetup: Bool
BlueComponent:
type: component
shoulds:
didLaunch:
1. Only once during the first setup:
if:
c.recentField == F.didSetup &&
c.didLaunch == false
then:
c.didLaunch = true
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
oneliners:
- didPrepareGL: renderInit(RenderVM.shared!)
- didPrepareGL: RenderVM.shared!.didPrepareGL = true
- 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:
if:
c.recentField == F.didSetup &&
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:
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
willRecreateSurface:
1. Upon resize:
if:
c.recentField == F.reshapePixelSize
then:
c.willRecreateSurface = true
+50
View File
@@ -0,0 +1,50 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget.*
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose)
}
android {
namespace = "org.opengamestudio"
compileSdk = 35
buildFeatures {
compose = true
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
defaultConfig {
applicationId = "org.opengamestudio.blue"
minSdk = 23
targetSdk = 35
versionCode = 1
versionName = "0.0.1"
}
}
dependencies {
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.activity.compose)
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.ui)
implementation(libs.androidx.ui.graphics)
implementation(libs.androidx.ui.tooling.preview)
implementation(libs.androidx.material3)
}
kotlin {
compilerOptions {
jvmTarget = JVM_1_8
}
sourceSets {
val main by getting {
dependencies {
}
}
}
}
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<application
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:label="OGS blue"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.MyApplication"
tools:targetApi="35">
<activity
android:name=".MainActivity"
android:exported="true"
android:label="OGS blue"
android:theme="@style/Theme.MyApplication"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
@@ -0,0 +1,13 @@
package org.opengamestudio
object ActivityDelegate {
val blue = BlueComponent
init {
otherSetupConsoleLogging(blue.ctrl, "Blue")
}
fun setup() {
blue.setup()
}
}
@@ -0,0 +1,36 @@
package org.opengamestudio
import android.graphics.Color
import android.os.Bundle
import androidx.activity.*
import androidx.activity.compose.setContent
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
import androidx.compose.ui.*
import androidx.compose.ui.graphics.Color as ComposeColor
import org.opengamestudio.ui.theme.MyApplicationTheme
class MainActivity: ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
ActivityDelegate.setup()
enableEdgeToEdge(
navigationBarStyle = SystemBarStyle.dark(Color.TRANSPARENT),
statusBarStyle = SystemBarStyle.dark(Color.TRANSPARENT)
)
setContent {
MyApplicationTheme {
Box(
contentAlignment = Alignment.Center,
modifier = Modifier
.fillMaxSize()
.background(ComposeColor.White)
) {
BlueView()
}
}
}
}
}
@@ -0,0 +1 @@
../../../../../../../../../components/blue/android/blue.kt
@@ -0,0 +1 @@
../../../../../../../../../../components/blue/android/view/BlueView.kt
@@ -0,0 +1,209 @@
package org.opengamestudio
val DIALECT_CONTEXT_RECENT_FIELD_NONE = "none"
interface DialectContext {
/**
* Name of the field that has just been changed
*
* Allows should-functions (reducers) to react only to
* relevant changes and ignore other changes of DialectContext
*/
var recentField: String
/**
* Get field's value by its name
*/
fun <T> field(name: String): T
/**
* Erase type
*
* Used by DialectController to assign recent field's value
*/
fun fieldAny(name: String): Any {
return field(name)
}
/**
* Create a copy of the DialectContext derivative
*
* Used by DialectController to treat all derived contexts as DialectContext
*/
fun selfCopy(): DialectContext
/**
* Set field's value by its name
*/
fun setField(name: String, value: Any?)
}
class DialectController(
var context: DialectContext
) {
internal var callbacks = mutableListOf<(c: DialectContext) -> Unit>()
internal var functions = mutableListOf<(c: DialectContext) -> DialectContext>()
var isProcessingQueue = false
internal var queue = mutableListOf<DialectContext>()
fun executeFunctions() {
val c = queue.removeAt(0)
// Keep SSOT: Only allow single field change per should-function
context.recentField = c.recentField
context.setField(c.recentField, c.fieldAny(c.recentField))
for (f in functions) {
val ctx = f(context.selfCopy())
if (ctx.recentField != DIALECT_CONTEXT_RECENT_FIELD_NONE) {
queue.add(ctx)
}
}
reportContext()
}
fun processQueue() {
// Prevent recursion.
if (isProcessingQueue) {
return
}
isProcessingQueue = true
while (queue.size > 0) {
executeFunctions()
}
isProcessingQueue = false
}
fun registerCallback(cb: (c: DialectContext) -> Unit) {
callbacks.add(cb)
}
fun registerFieldCallback(
fieldName: String,
cb: (DialectContext) -> Unit
) {
callbacks.add({ c ->
if (c.recentField == fieldName) {
cb(c)
}
})
}
fun registerFunction(f: (DialectContext) -> DialectContext) {
functions.add(f)
}
fun reportContext() {
for (cb in callbacks) {
cb(context)
}
}
fun set(fieldName: String, value: Any) {
var c = context.selfCopy()
c.setField(fieldName, value)
c.recentField = fieldName
queue.add(c)
processQueue()
}
}
// Register several oneliner callbacks to a controller
@Suppress("UNCHECKED_CAST")
fun registerOneliners(
ctrl: DialectController,
items: Array<Any>
) {
val halfCount = items.size / 2
for (i in 0..<halfCount) {
val field = items[i * 2] as String
val callback = items[i * 2 + 1] as (c: DialectContext) -> Unit
ctrl.registerFieldCallback(field, callback)
}
}
// Context field names for static type check
object F {
const val didLaunch = "didLaunch"
const val didSetup = "didSetup"
}
@Suppress("UNCHECKED_CAST")
data class BlueContext(
var didLaunch: Boolean = false,
var didSetup: Boolean = false,
override var recentField: String = ""
) : DialectContext {
override fun <T> field(name: String): T {
if (name == "didLaunch") {
return didLaunch as T
}
else if (name == "didSetup") {
return didSetup as T
}
return "" as T
}
override fun selfCopy(): DialectContext {
return this.copy()
}
override fun setField(
name: String,
value: Any?
) {
if (name == "didLaunch") {
didLaunch = value as Boolean
}
else if (name == "didSetup") {
didSetup = value as Boolean
}
}
}
fun blueSet(
key: String,
value: Any
) {
BlueComponent.ctrl.set(key, value)
}
fun blueShouldResetDidLaunch(c: BlueContext): BlueContext {
val 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
}
fun blueRegisterShoulds(ctrl: DialectController) {
listOf(
::blueShouldResetDidLaunch,
).forEach { f ->
ctrl.registerFunction { c -> f(c as BlueContext) }
}
}
fun blueRegisterEffects(ctrl: DialectController) {
registerOneliners(ctrl, arrayOf(
F.didLaunch, { c: BlueContext -> print("Blue launched") },
))
}
@@ -0,0 +1 @@
../../../../../../../../../components/other/other.kt
@@ -0,0 +1,11 @@
package org.opengamestudio.ui.theme
import androidx.compose.ui.graphics.Color
val Purple80 = Color(0xFFD0BCFF)
val PurpleGrey80 = Color(0xFFCCC2DC)
val Pink80 = Color(0xFFEFB8C8)
val Purple40 = Color(0xFF6650a4)
val PurpleGrey40 = Color(0xFF625b71)
val Pink40 = Color(0xFF7D5260)
@@ -0,0 +1,39 @@
package org.opengamestudio.ui.theme
import android.os.Build
import androidx.compose.material3.*
import androidx.compose.runtime.Composable
import androidx.compose.ui.platform.LocalContext
private val DarkColorScheme = darkColorScheme(
primary = Purple80,
secondary = PurpleGrey80,
tertiary = Pink80
)
private val LightColorScheme = lightColorScheme(
primary = Purple40,
secondary = PurpleGrey40,
tertiary = Pink40
)
@Composable
fun MyApplicationTheme(
darkTheme: Boolean = false,
dynamicColor: Boolean = false,
content: @Composable () -> Unit
) {
val colorScheme = when {
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ->
if (darkTheme) dynamicDarkColorScheme(LocalContext.current)
else dynamicLightColorScheme(LocalContext.current)
darkTheme -> DarkColorScheme
else -> LightColorScheme
}
MaterialTheme(
colorScheme = colorScheme,
typography = Typography,
content = content
)
}
@@ -0,0 +1,16 @@
package org.opengamestudio.ui.theme
import androidx.compose.material3.Typography
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.*
import androidx.compose.ui.unit.sp
val Typography = Typography(
bodyLarge = TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Normal,
fontSize = 16.sp,
lineHeight = 24.sp,
letterSpacing = 0.5.sp
)
)
Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_artwork" />
<foreground android:drawable="@android:color/transparent" />
</adaptive-icon>
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_artwork" />
<foreground android:drawable="@android:color/transparent" />
</adaptive-icon>
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
</resources>
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">OGS blue</string>
</resources>
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.MyApplication" parent="android:Theme.Material.NoActionBar">
<item name="android:windowBackground">#000000</item>
</style>
</resources>
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<full-backup-content>
</full-backup-content>
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<data-extraction-rules>
<cloud-backup>
<exclude domain="root" />
</cloud-backup>
<device-transfer>
<exclude domain="root" />
</device-transfer>
</data-extraction-rules>
+6
View File
@@ -0,0 +1,6 @@
plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.kotlin.compose) apply false
}
+26
View File
@@ -0,0 +1,26 @@
version: 4
output:
.build/dialect.swift:
type: swift
app/src/main/kotlin/org/opengamestudio/dialect.kt:
type: kotlin
BlueContext:
type: context
fields:
didLaunch: Bool
didSetup: Bool
BlueComponent:
type: component
oneliners:
- didLaunch: print("Blue launched")
shoulds:
didLaunch:
1. Only once during the first setup:
if:
c.recentField == F.didSetup &&
c.didLaunch == false
then:
c.didLaunch = true
+8
View File
@@ -0,0 +1,8 @@
# Use Compose for Android
android.useAndroidX=true
# Verbose build log
org.gradle.console=verbose
# Cache artifacts
org.gradle.caching=true
# JVM heap for Gradle and daemon
org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g
@@ -0,0 +1,24 @@
[versions]
activityCompose = "1.9.3"
agp = "8.7.3"
composeBom = "2024.12.01"
coreKtx = "1.15.0"
kotlin = "2.1.0"
lifecycleRuntimeKtx = "2.8.7"
[libraries]
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
androidx-ui = { group = "androidx.compose.ui", name = "ui" }
androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
android-library = { id = "com.android.library", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
Binary file not shown.
@@ -0,0 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Vendored Executable
+251
View File
@@ -0,0 +1,251 @@
#!/bin/sh
#
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#
##############################################################################
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
app_path=$0
# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
warn () {
echo "$*"
} >&2
die () {
echo
echo "$*"
echo
exit 1
} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD=java
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi
# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@"
+23
View File
@@ -0,0 +1,23 @@
pluginManagement {
repositories {
google {
content {
includeGroupByRegex("com\\.android.*")
includeGroupByRegex("com\\.google.*")
includeGroupByRegex("androidx.*")
}
}
mavenCentral()
gradlePluginPortal()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
}
}
rootProject.name = "OGS blue"
include("app")
Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

@@ -0,0 +1,14 @@
{
"images" : [
{
"filename" : "AppIcon.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
+29
View File
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleName</key>
<string>OGS blue</string>
<key>CFBundleDisplayName</key>
<string>OGS blue</string>
<key>CFBundleIdentifier</key>
<string>org.opengamestudio.blue</string>
<key>CFBundleExecutable</key>
<string>ogs-blue</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>UILaunchScreen</key>
<dict/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
</dict>
</plist>
+31
View File
@@ -0,0 +1,31 @@
name: OGS blue
options:
bundleIdPrefix: org.opengamestudio
targets:
ogs-blue:
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:
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
+23
View File
@@ -0,0 +1,23 @@
import UIKit
final class AppDelegate:
NSObject,
UIApplicationDelegate
{
let blue = BlueComponent()
let blueVM = BlueVM()
let render = RenderComponent()
let renderVM = RenderVM()
func application(
_ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
) -> Bool {
otherSetupConsoleLogging(blue.ctrl, "Blue")
blue.setup()
otherSetupConsoleLogging(render.ctrl, "Render")
render.setup()
return true
}
}
+15
View File
@@ -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"
+16
View File
@@ -0,0 +1,16 @@
import SwiftUI
@main
struct BlueApp: App {
@UIApplicationDelegateAdaptor(AppDelegate.self) private var appDelegate
var body: some Scene {
WindowGroup {
ZStack {
RenderView()
.ignoresSafeArea()
BlueView(appDelegate.blueVM)
}
}
}
}
@@ -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
+1
View File
@@ -0,0 +1 @@
../../../../components/blue/blue.swift
+1
View File
@@ -0,0 +1 @@
../../../../components/blue/blueVM.swift
+1
View File
@@ -0,0 +1 @@
../../../../../components/blue/ios/view/BlueView.swift
+1
View File
@@ -0,0 +1 @@
../../ver-mac/src/dialect.swift
+1
View File
@@ -0,0 +1 @@
../../../../components/egl/egl.h
+1
View File
@@ -0,0 +1 @@
../../../../components/egl/eglConst.h
+1
View File
@@ -0,0 +1 @@
../../../../components/other/other.swift
+1
View File
@@ -0,0 +1 @@
../../../../components/raybri/raybri.h
+1
View File
@@ -0,0 +1 @@
../../../../components/raybri/raybriConst.h
+1
View File
@@ -0,0 +1 @@
../../../../components/render/render.swift
+1
View File
@@ -0,0 +1 @@
../../../../components/render/ios/renderAux.swift
+1
View File
@@ -0,0 +1 @@
../../../../components/render/renderConst.swift
+1
View File
@@ -0,0 +1 @@
../../../../components/render/ios/renderEffect.swift
+1
View File
@@ -0,0 +1 @@
../../../../components/render/renderVM.swift
+1
View File
@@ -0,0 +1 @@
../../../../../components/render/ios/view/RenderGLView.swift
+1
View File
@@ -0,0 +1 @@
../../../../../components/render/ios/view/RenderView.swift
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleName</key>
<string>OGS blue</string>
<key>CFBundleDisplayName</key>
<string>OGS blue</string>
<key>CFBundleIdentifier</key>
<string>org.opengamestudio.blue</string>
<key>CFBundleExecutable</key>
<string>ogs-blue</string>
<key>CFBundleIconFile</key>
<string>AppIcon</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.0.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSMinimumSystemVersion</key>
<string>11.0</string>
<key>NSHighResolutionCapable</key>
<true/>
</dict>
</plist>
+39
View File
@@ -0,0 +1,39 @@
// swift-tools-version: 5.9
import Foundation
import PackageDescription
let raylibPrefix = ProcessInfo.processInfo.environment["RAYLIB_PREFIX"] ?? "/opt/homebrew"
let package = Package(
name: "OGSBlue",
platforms: [
.macOS(.v13)
],
targets: [
.target(
name: "RaylibBridge",
path: "src",
sources: ["Blue.c"],
publicHeadersPath: "raybri",
cSettings: [
.headerSearchPath("raybri"),
.unsafeFlags(["-I", "\(raylibPrefix)/include"])
]
),
.executableTarget(
name: "ogs-blue",
dependencies: ["RaylibBridge"],
path: "src",
exclude: ["raybri", "Blue.c"],
swiftSettings: [
.unsafeFlags(["-Xcc", "-DGL_SILENCE_DEPRECATION", "-Xcc", "-I\(raylibPrefix)/include"])
],
linkerSettings: [
.unsafeFlags([
"-L", "\(raylibPrefix)/lib",
"-lraylib"
])
]
)
]
)
+1
View File
@@ -0,0 +1 @@
../../../res/AppIcon.icns
+1
View File
@@ -0,0 +1 @@
../../../res/cube
+26
View File
@@ -0,0 +1,26 @@
import AppKit
final class AppDelegate:
NSObject,
NSApplicationDelegate
{
let blue = BlueComponent()
let blueVM = BlueVM()
let render = RenderComponent()
let renderVM = RenderVM()
func applicationDidFinishLaunching(_ notification: Notification) {
// Bring the app to the foreground
NSApp.setActivationPolicy(.regular)
NSApp.activate(ignoringOtherApps: true)
otherSetupConsoleLogging(blue.ctrl, "Blue")
blue.setup()
otherSetupConsoleLogging(render.ctrl, "Render")
render.setup()
}
func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
true
}
}
+8
View File
@@ -0,0 +1,8 @@
#define RAYBRI_CONST_IMPLEMENTATION
#include "raybriConst.h"
#define RAYBRI_AUX_IMPLEMENTATION
#include "raybriAux.h"
#define RAYBRI_IMPLEMENTATION
#include "raybri.h"
+17
View File
@@ -0,0 +1,17 @@
import SwiftUI
@main
struct BlueApp: App {
@NSApplicationDelegateAdaptor(AppDelegate.self) private var appDelegate
var body: some Scene {
WindowGroup {
ZStack {
RenderView()
.ignoresSafeArea()
BlueView(appDelegate.blueVM)
}
}
.defaultSize(width: 640, height: 480)
}
}
+1
View File
@@ -0,0 +1 @@
../../../../components/blue/blue.swift
+1
View File
@@ -0,0 +1 @@
../../../../components/blue/blueVM.swift
+1
View File
@@ -0,0 +1 @@
../../../../../components/blue/mac/view/BlueView.swift
+412
View File
@@ -0,0 +1,412 @@
// Reusable "none" constant
public let DIALECT_CONTEXT_RECENT_FIELD_NONE = "none"
// Base protocol for each component's state
public protocol DialectContext {
var recentField: String { get set }
func field<T>(_ name: String) -> T
func fieldAny(_ name: String) -> Any
mutating func setField(_ name: String, _ value: Any)
}
// Default implementation of `fieldAny` method for the protocol
public extension DialectContext {
func fieldAny(_ name: String) -> Any {
return field(name)
}
}
// The engine of the dialect components
public class DialectController {
var callbacks = [(DialectContext) -> Void]()
var context: DialectContext
var functions = [(DialectContext) -> DialectContext]()
var isProcessingQueue = false
var queue = [DialectContext]()
public init(_ context: DialectContext) {
self.context = context
}
func executeFunctions() {
let c = queue.removeFirst()
// Keep SSOT: Only allow single field change per should-function
context.recentField = c.recentField
context.setField(c.recentField, c.fieldAny(c.recentField))
for f in functions {
let ctx = f(context)
if ctx.recentField != DIALECT_CONTEXT_RECENT_FIELD_NONE {
queue.append(ctx)
}
}
reportContext()
}
func processQueue() {
// Prevent recursion.
if isProcessingQueue {
return
}
isProcessingQueue = true
while (queue.count > 0) {
executeFunctions()
}
isProcessingQueue = false
}
public func registerCallback(_ cb: @escaping (DialectContext) -> Void) {
callbacks.append(cb)
}
public func registerFieldCallback(
_ fieldName: String,
_ cb: @escaping (DialectContext) -> Void
) {
callbacks.append({ c in
if c.recentField == fieldName {
cb(c)
}
})
}
public func registerFunction(_ f: @escaping (DialectContext) -> DialectContext) {
functions.append(f)
}
func reportContext() {
for cb in callbacks {
cb(context)
}
}
public func set(
_ fieldName: String,
_ value: Any
) {
var c = context
c.setField(fieldName, value)
c.recentField = fieldName
queue.append(c)
processQueue()
}
}
// Register several oneliner callbacks to a controller
func registerOneliners<T>(
_ ctrl: DialectController,
_ items: [Any]
) -> T? {
let halfCount = items.count / 2
for i in 0..<halfCount {
let field = items[i * 2] as! String
let callback = items[i * 2 + 1] as! (T) -> Void
ctrl.registerFieldCallback(field) { cc in
let c = cc as! T
callback(c)
}
}
// A hack for generics to operate
return nil
}
// 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 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 {
public var didLaunch = Bool()
public var didSetup = Bool()
public var recentField = ""
public func field<T>(_ name: String) -> T {
if (name == "didLaunch") {
return didLaunch as! T
}
else if (name == "didSetup") {
return didSetup as! T
}
return "unknown-field-name" as! T
}
public mutating func setField(
_ name: String,
_ value: Any
) {
if (name == "didLaunch") {
didLaunch = value as! Bool
}
else if (name == "didSetup") {
didSetup = value as! Bool
}
}
}
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 = ""
public func field<T>(_ 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 == "didPrepareIOSGL") {
return didPrepareIOSGL as! T
}
else if (name == "didPrepareMacGL") {
return didPrepareMacGL 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
}
else if (name == "willRecreateSurface") {
return willRecreateSurface 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 == "didPrepareIOSGL") {
didPrepareIOSGL = value as! Bool
}
else if (name == "didPrepareMacGL") {
didPrepareMacGL = 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
}
else if (name == "willRecreateSurface") {
willRecreateSurface = value as! Bool
}
}
}
public func blueSet(
_ key: String,
_ value: Any
) {
BlueComponent.singleton!.ctrl.set(key, value)
}
public func renderSet(
_ key: String,
_ value: Any
) {
RenderComponent.singleton!.ctrl.set(key, value)
}
func blueShouldResetDidLaunch(_ c: BlueContext) -> BlueContext {
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 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 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
/* 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 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,
].forEach { f in
ctrl.registerFunction { c in f(c as! BlueContext) }
}
}
func renderRegisterShoulds(_ ctrl: DialectController) {
[
renderShouldResetDidLaunch,
renderShouldResetDidPrepareGL,
renderShouldResetPixelSize,
renderShouldResetWillRecreateSurface,
].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.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!) },
])
}
Loaded 100 of 140 files, more files were not shown because too many files have changed in this diff. Show more