Iris: "the organization of the rust rewrite is a mess right now... there shouldn't be anything related to the app inside of iris. Iris is supposed to be the UI framework alone." And, on the crate count: "I'm confused why the app only code needs more than one crate though." Nine cargo workspaces become three, and the port's project code -- which sat in five places, four of them inside the framework -- becomes one crate, `ai-app`, in `app-rust/`: client-core -> app-rust/src/client iris/transcript-ui -> app-rust/src/ui iris/transcript-fixture -> app-rust/src/ui/fixture.rs + tests/ + touch/ iris/desktop-app -> app-rust/src/desktop + src/bin_desktop.rs iris/android-app -> app-rust/src/android + android-project/ android-shell -> app-rust/src/shell iris/ keeps core, macro, the iris crate, tabs-ui and rig-input, and now mentions no session, transcript, setup or server anywhere. Only two of the old splits had a reason that survived reading. event-model stays a crate at the repo root because server/ depends on it too, so a crate is what makes the backend and the app agree by construction. The two Android .so names looked like a hard constraint -- a package produces one library artifact -- until P2 turned out to already plan merging those two Android apps into one; both faces now come out of libai_app.so, picked apart by features so `--no-default-features --features shell` keeps wgpu, parley and iris out of the Compose app's APK. docs/RUST.md's "One app crate" has the rest, including what each remaining feature is for. DECISIONS.md and SUBAGENTS.md move into docs/ with everything else. Verified: ./run-tests.sh and `cd iris && cargo test` green, clippy and fmt clean in all five workspaces, `cargo ndk -t x86_64` links libai_app.so, build-apk.sh produces an APK that installs and launches on this checkout's emulator (Gl ... virgl, as expected), and the phone-sized headless screenshot renders the transcript unchanged. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
50 lines
860 B
Rust
50 lines
860 B
Rust
use crate::util::Vec2;
|
|
use std::marker::Destruct;
|
|
|
|
pub const trait UiNum {
|
|
fn to_f32(self) -> f32;
|
|
}
|
|
|
|
const impl UiNum for f32 {
|
|
fn to_f32(self) -> f32 {
|
|
self
|
|
}
|
|
}
|
|
|
|
const impl UiNum for u32 {
|
|
fn to_f32(self) -> f32 {
|
|
self as f32
|
|
}
|
|
}
|
|
|
|
const impl UiNum for i32 {
|
|
fn to_f32(self) -> f32 {
|
|
self as f32
|
|
}
|
|
}
|
|
|
|
pub const fn vec2(x: impl const UiNum, y: impl const UiNum) -> Vec2 {
|
|
Vec2::new(x.to_f32(), y.to_f32())
|
|
}
|
|
|
|
const impl<T: const UiNum + Copy> From<T> for Vec2 {
|
|
fn from(v: T) -> Self {
|
|
Self {
|
|
x: v.to_f32(),
|
|
y: v.to_f32(),
|
|
}
|
|
}
|
|
}
|
|
|
|
const impl<T: const UiNum, U: const UiNum> From<(T, U)> for Vec2
|
|
where
|
|
(T, U): const Destruct,
|
|
{
|
|
fn from((x, y): (T, U)) -> Self {
|
|
Self {
|
|
x: x.to_f32(),
|
|
y: y.to_f32(),
|
|
}
|
|
}
|
|
}
|