From 70573bf3a0eb5d6ef2cb160e89632bf0da995b6c Mon Sep 17 00:00:00 2001 From: mehbark <terezi@pyrope.net> Date: Mon, 10 Mar 2025 21:34:26 -0400 Subject: [PATCH] mvp --- Cargo.lock | 244 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 7 ++ src/main.rs | 210 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 461 insertions(+) create mode 100644 Cargo.lock create mode 100644 Cargo.toml create mode 100644 src/main.rs diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 index 0000000..a5d0608 --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,244 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "anstream" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" + +[[package]] +name = "anstyle-parse" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +dependencies = [ + "anstyle", + "once_cell", + "windows-sys", +] + +[[package]] +name = "clap" +version = "4.5.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" + +[[package]] +name = "colorchoice" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + +[[package]] +name = "grapher" +version = "0.1.0" +dependencies = [ + "clap", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "once_cell" +version = "1.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde51589ab56b20a6f686b2c68f7a0bd6add753d697abf720d63f8db3ab7b1ad" + +[[package]] +name = "proc-macro2" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "2.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..f0216fb --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "grapher" +version = "0.1.0" +edition = "2021" + +[dependencies] +clap = { version = "4.5.32", features = ["derive"] } diff --git a/src/main.rs b/src/main.rs new file mode 100644 index 0000000..cc01f78 --- /dev/null +++ b/src/main.rs @@ -0,0 +1,210 @@ +use std::{ + error::Error, + fmt::{self}, + num::NonZero, + ops::{Add, Div, Mul, Sub}, + process, + str::FromStr, +}; + +use clap::Parser; + +fn main() { + let Args { + width, + height, + expr, + xmin, + ymin, + xmax, + ymax, + } = Args::parse(); + let expr = match expr.parse::<Expr>() { + Ok(expr) => expr, + Err(err) => { + eprintln!("{err}"); + process::exit(1); + } + }; + + let pos_to_sample = |ix: u16, iy: u16| -> (f32, f32) { + // TODO: bad + let (width, height): (u16, u16) = (width.into(), height.into()); + let (width, height): (f32, f32) = (width.into(), height.into()); + let (x, y) = (f32::from(ix), f32::from(iy)); + ( + x / width * (xmax - xmin) + xmin, + y / height * (ymax - ymin) + ymin, + ) + }; + + let (mut min, mut max) = (-1.0f32, 1.0f32); + // first, find the min and max of the function + // (literally doubles our runtime :D) + for iy in 0..(height.into()) { + for ix in 0..(width.into()) { + let (x, y) = pos_to_sample(ix, iy); + let i = expr.eval(x, y); + min = min.min(i); + max = max.max(i); + } + } + let (min, max) = (min, max); + + for iy in 0..(height.into()) { + for ix in 0..(width.into()) { + let (x, y) = pos_to_sample(ix, iy); + let i = expr.eval(x, y); + let scaled = i / (max - min); + let channel = (i * 256.0) as u8; + put_pixel(channel, channel, channel); + put_pixel(channel, channel, channel); + } + println!(); + } +} + +fn put_pixel(r: u8, g: u8, b: u8) { + print!("\x1b[48;2;{r};{g};{b}m "); +} + +#[derive(Debug, Parser)] +struct Args { + #[arg(long)] + width: NonZero<u16>, + #[arg(long)] + height: NonZero<u16>, + #[arg(short, long)] + expr: String, + #[arg(default_value_t = -1.0)] + xmin: f32, + #[arg(default_value_t = -1.0)] + ymin: f32, + #[arg(default_value_t = 1.0)] + xmax: f32, + #[arg(default_value_t = 1.0)] + ymax: f32, +} + +#[derive(Debug)] +enum Expr { + X, + Y, + Const(f32), + Monadic(fn(f32) -> f32, Box<Expr>), + Dyadic(fn(f32, f32) -> f32, Box<Expr>, Box<Expr>), +} + +#[derive(Debug)] +enum ExprFunction { + Monadic(fn(f32) -> f32), + Dyadic(fn(f32, f32) -> f32), +} + +impl FromStr for ExprFunction { + type Err = (); + + fn from_str(s: &str) -> Result<Self, Self::Err> { + use ExprFunction::{Dyadic, Monadic}; + let func = match s { + "sin" => Monadic(f32::sin), + "cos" => Monadic(f32::cos), + "tan" => Monadic(f32::tan), + "arcsin" | "asin" => Monadic(f32::asin), + "arccos" | "acos" => Monadic(f32::acos), + "arctan" | "atan" => Monadic(f32::atan), + "sqrt" => Monadic(f32::sqrt), + "abs" => Monadic(f32::abs), + "+" => Dyadic(Add::add), + "-" => Dyadic(Sub::sub), + "*" => Dyadic(Mul::mul), + "/" => Dyadic(Div::div), + "^" => Dyadic(f32::powf), + _ => return Err(()), + }; + Ok(func) + } +} + +impl Expr { + #[allow(clippy::many_single_char_names)] + fn eval(&self, x: f32, y: f32) -> f32 { + match self { + Expr::X => x, + Expr::Y => y, + Expr::Const(n) => *n, + Expr::Monadic(f, expr) => f(expr.eval(x, y)), + Expr::Dyadic(f, a, b) => f(a.eval(x, y), b.eval(x, y)), + } + } +} + +#[derive(Debug)] +enum ExprParseError { + UnknownToken { token: String, stack: Vec<Expr> }, + ExpectedToken { stack: Vec<Expr> }, +} + +impl fmt::Display for ExprParseError { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + match self { + ExprParseError::UnknownToken { token, stack } => write!( + f, + "Unknown token: \"{}\" Stack: {stack:?}", + token.escape_debug() + ), + ExprParseError::ExpectedToken { stack } => write!(f, "Expected token Stack: {stack:?}"), + } + } +} + +impl Error for ExprParseError {} + +impl FromStr for Expr { + type Err = ExprParseError; + + fn from_str(s: &str) -> Result<Self, Self::Err> { + use Expr::{Const, Dyadic, Monadic, X, Y}; + let mut stack = Vec::new(); + for token in s.split_ascii_whitespace() { + if token == "x" { + stack.push(X); + continue; + } + if token == "y" { + stack.push(Y); + continue; + } + + if let Ok(n) = token.parse() { + stack.push(Const(n)); + continue; + } + + match ExprFunction::from_str(token) { + Ok(ExprFunction::Monadic(f)) => { + let Some(x) = stack.pop() else { + return Err(ExprParseError::ExpectedToken { stack }); + }; + stack.push(Monadic(f, x.into())); + } + Ok(ExprFunction::Dyadic(f)) => { + let Some(x) = stack.pop() else { + return Err(ExprParseError::ExpectedToken { stack }); + }; + let Some(y) = stack.pop() else { + return Err(ExprParseError::ExpectedToken { stack }); + }; + stack.push(Dyadic(f, x.into(), y.into())); + } + Err(()) => { + return Err(ExprParseError::UnknownToken { + token: token.to_owned(), + stack, + }) + } + } + } + stack.pop().ok_or(ExprParseError::ExpectedToken { stack }) + } +}