add one or many

Author: Pyxrs

.github/workflows/rust.yml

@@ -1,22 +1,22 @@
-name: Rust
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Build
-      run: cargo build --verbose
-    - name: Run tests
-      run: cargo test --verbose
+name: Rust
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build
+      run: cargo build --verbose
+    - name: Run tests
+      run: cargo test --verbose

LICENSE.md

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2024 Pyxrs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2024 Pyxrs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,2 +1,2 @@
-# Pstd
-A bloated custom standard library for Rust
+# Pstd
+A bloated custom standard library for Rust

src/lib.rs

@@ -1,125 +1,130 @@
-pub use chrono as time;
-pub use closure;
-#[cfg(feature = "rand")]
-pub use fastrand;
-#[cfg(feature = "image")]
-pub use image;
-#[cfg(feature = "log")]
-pub use log;
-#[cfg(feature = "rand")]
-pub use rand;
-pub use rayon;
-pub use relative_path as path;
-
-pub mod prelude {
-    pub use closure::closure;
-    #[cfg(feature = "log")]
-    pub use log::{debug, error, info, trace, warn};
-    pub use std::time::{Duration, Instant};
-}
-
-pub mod anyhow {
-    pub use anyhow::{anyhow, bail, ensure, Chain, Context, Error, Ok};
-    pub type AnyResult<T> = anyhow::Result<T>;
-}
-
-#[cfg(feature = "async")]
-pub mod r#async {
-    pub use futures::*;
-}
-
-pub mod collections {
-    pub use ahash as insecure;
-}
-
-/// Concurrency
-pub mod sync {
-    // Channels
-    pub use flume::*;
-    // Locks
-    pub use parking_lot::*;
-    // Collections
-    pub use scc::*;
-}
-
-/// Returns input value clamped to the interval `[min, max]`.
-#[must_use]
-#[inline]
-pub fn clamp<T: PartialOrd>(val: T, min: T, max: T) -> T {
-    if val > min {
-        if val < max {
-            val
-        } else {
-            max
-        }
-    } else {
-        min
-    }
-}
-
-/// Returns input value clamped to the interval `[min, max]`.
-#[inline]
-pub fn clamp_ref<T: PartialOrd>(val: &mut T, min: T, max: T) {
-    if *val > min {
-        if *val > max {
-            *val = max;
-        }
-    } else {
-        *val = min;
-    }
-}
-
-pub trait ClampRef {
-    fn clamp_ref(&mut self, min: Self, max: Self);
-}
-
-impl<T: PartialOrd> ClampRef for T {
-    fn clamp_ref(&mut self, min: Self, max: Self) {
-        clamp_ref(self, min, max);
-    }
-}
-
-#[cfg(feature = "game")]
-pub mod game {
-    pub use glam;
-    pub use noise;
-
-    pub fn sun_direction(time_of_day: f32, latitude: f32, time_of_year: f32) -> glam::Vec3A {
-        use std::f32::consts::PI;
-
-        // Convert time of day from [0, 1] to [-π, π]
-        let solar_time_rads = 2.0 * PI * (time_of_day - 0.5);
-
-        // Convert time of year from [0, 1] to [-0.41, 0.41]
-        // offset by 0.25 so declination is 0 at equinoxes
-        let declination_rads = (2.0 * PI * (time_of_year - 0.25)).sin() * 23.45f32.to_radians();
-
-        // Convert latitude from [0, 1] to [-π/2, π/2]
-        let latitude_rads = PI * (latitude - 0.5);
-
-        // equations adapted from https://stackoverflow.com/questions/8708048/position-of-the-sun-given-time-of-day-latitude-and-longitude
-        let zenith_rads = (latitude_rads.sin() * declination_rads.sin()
-            + latitude_rads.cos() * declination_rads.cos() * solar_time_rads.cos())
-        .acos();
-
-        let mut azimuth_rads = ((latitude_rads.sin() * zenith_rads.cos() - declination_rads.sin())
-            / (latitude_rads.cos() * zenith_rads.sin()))
-        .acos();
-
-        let elevation_rads = (declination_rads.sin() * latitude_rads.sin()
-            + declination_rads.cos() * latitude_rads.cos() * solar_time_rads.cos())
-        .asin();
-
-        if solar_time_rads > 0.0f32 {
-            azimuth_rads += PI;
-        } else {
-            azimuth_rads = 3.0 * PI - azimuth_rads;
-        }
-
-        glam::Vec3A::new(
-            azimuth_rads.sin() * elevation_rads.cos(),
-            elevation_rads.sin(),
-            azimuth_rads.cos() * elevation_rads.cos(),
-        )
-    }
-}
+pub use chrono as time;
+pub use closure;
+#[cfg(feature = "rand")]
+pub use fastrand;
+#[cfg(feature = "image")]
+pub use image;
+#[cfg(feature = "log")]
+pub use log;
+#[cfg(feature = "rand")]
+pub use rand;
+pub use rayon;
+pub use relative_path as path;
+
+pub mod prelude {
+    pub use closure::closure;
+    #[cfg(feature = "log")]
+    pub use log::{debug, error, info, trace, warn};
+    pub use std::time::{Duration, Instant};
+}
+
+pub mod anyhow {
+    pub use anyhow::{anyhow, bail, ensure, Chain, Context, Error, Ok};
+    pub type AnyResult<T> = anyhow::Result<T>;
+}
+
+#[cfg(feature = "async")]
+pub mod r#async {
+    pub use futures::*;
+}
+
+pub mod collections {
+    pub use ahash as insecure;
+
+    pub enum OneOrMany<T> {
+        One(T),
+        Many(Vec<T>),
+    }
+}
+
+/// Concurrency
+pub mod sync {
+    // Channels
+    pub use flume::*;
+    // Locks
+    pub use parking_lot::*;
+    // Collections
+    pub use scc::*;
+}
+
+/// Returns input value clamped to the interval `[min, max]`.
+#[must_use]
+#[inline]
+pub fn clamp<T: PartialOrd>(val: T, min: T, max: T) -> T {
+    if val > min {
+        if val < max {
+            val
+        } else {
+            max
+        }
+    } else {
+        min
+    }
+}
+
+/// Returns input value clamped to the interval `[min, max]`.
+#[inline]
+pub fn clamp_ref<T: PartialOrd>(val: &mut T, min: T, max: T) {
+    if *val > min {
+        if *val > max {
+            *val = max;
+        }
+    } else {
+        *val = min;
+    }
+}
+
+pub trait ClampRef {
+    fn clamp_ref(&mut self, min: Self, max: Self);
+}
+
+impl<T: PartialOrd> ClampRef for T {
+    fn clamp_ref(&mut self, min: Self, max: Self) {
+        clamp_ref(self, min, max);
+    }
+}
+
+#[cfg(feature = "game")]
+pub mod game {
+    pub use glam;
+    pub use noise;
+
+    pub fn sun_direction(time_of_day: f32, latitude: f32, time_of_year: f32) -> glam::Vec3A {
+        use std::f32::consts::PI;
+
+        // Convert time of day from [0, 1] to [-π, π]
+        let solar_time_rads = 2.0 * PI * (time_of_day - 0.5);
+
+        // Convert time of year from [0, 1] to [-0.41, 0.41]
+        // offset by 0.25 so declination is 0 at equinoxes
+        let declination_rads = (2.0 * PI * (time_of_year - 0.25)).sin() * 23.45f32.to_radians();
+
+        // Convert latitude from [0, 1] to [-π/2, π/2]
+        let latitude_rads = PI * (latitude - 0.5);
+
+        // equations adapted from https://stackoverflow.com/questions/8708048/position-of-the-sun-given-time-of-day-latitude-and-longitude
+        let zenith_rads = (latitude_rads.sin() * declination_rads.sin()
+            + latitude_rads.cos() * declination_rads.cos() * solar_time_rads.cos())
+        .acos();
+
+        let mut azimuth_rads = ((latitude_rads.sin() * zenith_rads.cos() - declination_rads.sin())
+            / (latitude_rads.cos() * zenith_rads.sin()))
+        .acos();
+
+        let elevation_rads = (declination_rads.sin() * latitude_rads.sin()
+            + declination_rads.cos() * latitude_rads.cos() * solar_time_rads.cos())
+        .asin();
+
+        if solar_time_rads > 0.0f32 {
+            azimuth_rads += PI;
+        } else {
+            azimuth_rads = 3.0 * PI - azimuth_rads;
+        }
+
+        glam::Vec3A::new(
+            azimuth_rads.sin() * elevation_rads.cos(),
+            elevation_rads.sin(),
+            azimuth_rads.cos() * elevation_rads.cos(),
+        )
+    }
+}